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/12 17:08:11 UTC
ambari git commit: AMBARI-11884. Upgrade: error w/ ambari-server
upgrade widgets.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 569290d7b -> fbbe77c3d
AMBARI-11884. Upgrade: error w/ ambari-server upgrade widgets.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbbe77c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbbe77c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbbe77c3
Branch: refs/heads/trunk
Commit: fbbe77c3d760f8de57995fcb4cd29e3bd67c05a3
Parents: 569290d
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Jun 12 09:45:30 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Jun 12 09:45:30 2015 +0300
----------------------------------------------------------------------
.../server/controller/AmbariManagementControllerImpl.java | 3 +--
.../org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbbe77c3/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 4a7e305..6a3cc1c 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,8 +4188,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
layoutEntity.setListWidgetLayoutUserWidgetEntity(widgetLayoutUserWidgetEntityList);
- widgetLayoutDAO.create(layoutEntity);
- widgetLayoutDAO.refresh(layoutEntity);
+ widgetLayoutDAO.createWithFlush(layoutEntity);
} else {
if (existingEntities.size() > 1) {
LOG.warn("Skip updating layout since multiple widget layouts " +
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbbe77c3/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 5e794a7..8746210 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
@@ -90,6 +90,14 @@ public class WidgetLayoutDAO {
}
@Transactional
+ public void createWithFlush(WidgetLayoutEntity widgetLayoutEntity) {
+ EntityManager entityManager = entityManagerProvider.get();
+ entityManager.persist(widgetLayoutEntity);
+ entityManager.flush();
+ entityManager.refresh(widgetLayoutEntity);
+ }
+
+ @Transactional
public WidgetLayoutEntity merge(WidgetLayoutEntity widgetLayoutEntity) {
return entityManagerProvider.get().merge(widgetLayoutEntity);
}