ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-11840. Ambari upgrade crashed due to unable to process WidgetLayoutEntries.(vbrodetskyi)
Date Wed, 10 Jun 2015 17:07:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 370d4ca19 -> 0dd1cabac


AMBARI-11840. Ambari upgrade crashed due to unable to process WidgetLayoutEntries.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0dd1caba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0dd1caba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0dd1caba

Branch: refs/heads/branch-2.1
Commit: 0dd1cabacde39c18cc21084565c573ba75784afa
Parents: 370d4ca
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Jun 10 11:43:53 2015 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Jun 10 11:43:53 2015 +0300

----------------------------------------------------------------------
 .../ambari/server/controller/AmbariManagementControllerImpl.java    | 1 -
 .../main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0dd1caba/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 9e8a5e5..49af6d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4188,7 +4188,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
               }
             }
             widgetLayoutDAO.mergeWithFlush(existingLayoutEntity);
-            widgetLayoutDAO.refresh(existingLayoutEntity);
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0dd1caba/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java
index 2019e3b..5e794a7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java
@@ -99,6 +99,7 @@ public class WidgetLayoutDAO {
     EntityManager entityManager = entityManagerProvider.get();
     widgetLayoutEntity = entityManager.merge(widgetLayoutEntity);
     entityManager.flush();
+    entityManager.refresh(widgetLayoutEntity);
     return widgetLayoutEntity;
   }
 


Mime
View raw message