Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 606b84c91 -> 046dfd44f


AMBARI-13735. Ambari throws error when updating Notification. (Laszlo Puskas 
via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/046dfd44
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/046dfd44
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/046dfd44

Branch: refs/heads/branch-2.2
Commit: 046dfd44f5a8ca8169d5a41f6adc4a792ba3d088
Parents: 606b84c
Author: Siddharth Wagle <swa...@hortonworks.com>
Authored: Fri Dec 4 15:21:01 2015 -0800
Committer: Siddharth Wagle <swa...@hortonworks.com>
Committed: Fri Dec 4 15:21:01 2015 -0800

----------------------------------------------------------------------
 .../apache/ambari/server/orm/entities/AlertTargetEntity.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/046dfd44/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
index 5151a4a..4bbdd76 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
@@ -47,6 +47,7 @@ import javax.persistence.Table;
 import javax.persistence.TableGenerator;
 
 import org.apache.ambari.server.state.AlertState;
+import org.eclipse.persistence.annotations.Noncacheable;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -89,8 +90,8 @@ public class AlertTargetEntity {
   /**
    * Bi-directional many-to-many association to {@link AlertGroupEntity}
    */
-  @ManyToMany(mappedBy = "alertTargets", cascade = { CascadeType.MERGE,
-      CascadeType.REFRESH })
+  @ManyToMany(mappedBy = "alertTargets", cascade = {CascadeType.MERGE, 
CascadeType.REFRESH})
+  @Noncacheable
   private Set<AlertGroupEntity> alertGroups;
 
   /**

Reply via email to