AMBARI-17260. Remove CascadeType in ServiceComponentHistoryEntity for ServiceComponentDesiredStateEntity (ajit)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78c95db2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78c95db2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78c95db2 Branch: refs/heads/branch-2.5 Commit: 78c95db2e3c7201ceeaedc6a5e8ccea8e45ae3b1 Parents: d09eb5d Author: Ajit Kumar <[email protected]> Authored: Wed Jun 15 19:16:06 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Sep 28 23:17:37 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/78c95db2/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 1521468..d7e1b0a 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 @@ -59,7 +59,7 @@ public class ServiceComponentHistoryEntity { @Column(name = "id", nullable = false, updatable = false) private long m_id; - @ManyToOne(optional = false, cascade = { CascadeType.MERGE }) + @ManyToOne(optional = false) @JoinColumn(name = "component_id", referencedColumnName = "id", nullable = false) private ServiceComponentDesiredStateEntity m_serviceComponentDesiredStateEntity;
