svn commit: r1468158 - in /incubator/ambari/trunk: CHANGES.txt ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java

[smohanty]

Author: smohanty
Date: Mon Apr 15 17:18:33 2013
New Revision: 1468158

URL: http://svn.apache.org/r1468158
Log:
AMBARI-1933. Test failure : testCascadeDeleteStages. (smohanty)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1468158&r1=1468157&r2=1468158&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Apr 15 17:18:33 2013
@@ -719,6 +719,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1933. Test failure : testCascadeDeleteStages. (smohanty)
+
  AMBARI-1931. params/run_smoke_test=true is not taking effect. (smohanty)
 
  AMBARI-1919. JobTracker History Server failed to come up on 1.3.0 stack

Modified: 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java?rev=1468158&r1=1468157&r2=1468158&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
 Mon Apr 15 17:18:33 2013
@@ -73,7 +73,7 @@ public class ClusterEntity {
   @ManyToMany(mappedBy = "clusterEntities")
   private Collection<HostEntity> hostEntities;
 
-  @OneToMany(mappedBy = "cluster", cascade = CascadeType.REMOVE)
+  @OneToMany(mappedBy = "cluster", cascade = {CascadeType.REMOVE, 
CascadeType.REFRESH})
   private Collection<StageEntity> stages;
 
   @OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.ALL)