Repository: ambari Updated Branches: refs/heads/branch-2.4 dbc865b48 -> 68b9cdad6
Revert "AMBARI-17260. Remove CascadeType in ServiceComponentHistoryEntity for ServiceComponentDesiredStateEntity (ajit)" Reverted due to UT failure. This reverts commit 52031632c034ab714aed71560e430a39ddf7f210. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68b9cdad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68b9cdad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68b9cdad Branch: refs/heads/branch-2.4 Commit: 68b9cdad6b4116e923545ed4fc0a659445999439 Parents: dbc865b Author: Yusaku Sako <[email protected]> Authored: Thu Jun 16 15:39:14 2016 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Jun 16 15:39:14 2016 -0700 ---------------------------------------------------------------------- .../ambari/server/orm/entities/ServiceComponentHistoryEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/68b9cdad/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java index 0783d98..e7fef71 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java @@ -57,7 +57,7 @@ public class ServiceComponentHistoryEntity { @Column(name = "id", nullable = false, updatable = false) private long m_id; - @ManyToOne(optional = false) + @ManyToOne(optional = false, cascade = { CascadeType.MERGE }) @JoinColumn(name = "component_id", referencedColumnName = "id", nullable = false) private ServiceComponentDesiredStateEntity m_serviceComponentDesiredStateEntity;
