You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/06/10 19:04:42 UTC
ambari git commit: AMBARI-11840. Ambari upgrade crashed due to unable
to process WidgetLayoutEntries.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 95f7f6d89 -> 829a5e85c
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/829a5e85
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/829a5e85
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/829a5e85
Branch: refs/heads/trunk
Commit: 829a5e85cb65f2474c4f9fe354ef0ef42de0877b
Parents: 95f7f6d
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Jun 10 11:41:43 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Jun 10 11:41:43 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/829a5e85/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 bd12cee..4a7e305 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
@@ -4221,7 +4221,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
widgetLayoutDAO.mergeWithFlush(existingLayoutEntity);
- widgetLayoutDAO.refresh(existingLayoutEntity);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/829a5e85/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;
}