You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/06/05 14:54:12 UTC
ambari git commit: AMBARI-11702 Enhanced Dashboard: Server Error on
toggling add widget (additional patch) (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 615c2d698 -> ea7485ae5
AMBARI-11702 Enhanced Dashboard: Server Error on toggling add widget (additional patch) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea7485ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea7485ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea7485ae
Branch: refs/heads/trunk
Commit: ea7485ae568d533d7aea9f31de8a96846d0d5a8c
Parents: 615c2d6
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Jun 5 15:50:53 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Jun 5 15:50:53 2015 +0300
----------------------------------------------------------------------
.../controller/internal/WidgetLayoutResourceProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea7485ae/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
index 8184d34..2f05402 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
@@ -268,7 +268,7 @@ public class WidgetLayoutResourceProviderTest {
resetToStrict(dao, widgetDAO);
expect(dao.findById(1L)).andReturn(entity).anyTimes();
- expect(dao.merge((WidgetLayoutEntity) anyObject())).andReturn(entity).anyTimes();
+ expect(dao.mergeWithFlush((WidgetLayoutEntity) anyObject())).andReturn(entity).anyTimes();
expect(widgetDAO.merge(widgetEntity)).andReturn(widgetEntity).anyTimes();
expect(widgetDAO.findById(2L)).andReturn(widgetEntity2).anyTimes();
replay(dao, widgetDAO);