You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/02/13 13:07:17 UTC

[2/5] syncope git commit: Fixing difference MAttr <> RAttr

Fixing difference MAttr <> RAttr


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/197e9391
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/197e9391
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/197e9391

Branch: refs/heads/master
Commit: 197e9391d6a03118d7582ab9454e1b1378a923e8
Parents: dec1a32
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Feb 13 13:05:02 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Feb 13 13:05:02 2015 +0100

----------------------------------------------------------------------
 .../apache/syncope/core/persistence/beans/membership/MAttr.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/197e9391/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
index 5ced40d..e1527b7 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
@@ -101,7 +101,6 @@ public class MAttr extends AbstractAttr {
             throw new ClassCastException("attributeValue is expected to be typed MAttrValue: " + attributeValue.
                     getClass().getName());
         }
-        attributeValue.setAttribute(this);
         return values.add((MAttrValue) attributeValue);
     }
 
@@ -111,9 +110,7 @@ public class MAttr extends AbstractAttr {
             throw new ClassCastException("attributeValue is expected to be typed MAttrValue: " + attributeValue.
                     getClass().getName());
         }
-        boolean result = values.remove((MAttrValue) attributeValue);
-        attributeValue.setAttribute(null);
-        return result;
+        return values.remove((MAttrValue) attributeValue);
     }
 
     @SuppressWarnings("unchecked")