syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [3/5] syncope git commit: [SYNCOPE-683] #resolve
Date Mon, 13 Jul 2015 10:32:37 GMT
[SYNCOPE-683] #resolve


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

Branch: refs/heads/master
Commit: 81a66445f1e7db024a602146e9eb51f44752ea64
Parents: f5df7f5
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Jul 13 12:02:23 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Jul 13 12:02:23 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/syncope/common/to/RoleTO.java  | 12 ++++++------
 .../syncope/common/util/AttributableOperations.java     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/81a66445/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/syncope/common/to/RoleTO.java b/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
index 245ea07..7673c0d 100644
--- a/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
+++ b/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
@@ -59,17 +59,17 @@ public class RoleTO extends AbstractSubjectTO {
 
     private final List<String> entitlements = new ArrayList<String>();
 
-    private List<String> rAttrTemplates = new ArrayList<String>();
+    private final List<String> rAttrTemplates = new ArrayList<String>();
 
-    private List<String> rDerAttrTemplates = new ArrayList<String>();
+    private final List<String> rDerAttrTemplates = new ArrayList<String>();
 
-    private List<String> rVirAttrTemplates = new ArrayList<String>();
+    private final List<String> rVirAttrTemplates = new ArrayList<String>();
 
-    private List<String> mAttrTemplates = new ArrayList<String>();
+    private final List<String> mAttrTemplates = new ArrayList<String>();
 
-    private List<String> mDerAttrTemplates = new ArrayList<String>();
+    private final List<String> mDerAttrTemplates = new ArrayList<String>();
 
-    private List<String> mVirAttrTemplates = new ArrayList<String>();
+    private final List<String> mVirAttrTemplates = new ArrayList<String>();
 
     private Long passwordPolicy;
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/81a66445/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
b/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
index 44427cc..449f86f 100644
--- a/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
+++ b/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
@@ -118,7 +118,7 @@ public final class AttributableOperations {
             final boolean incremental) {
 
         // 1. check same id
-        if (updated.getId() != original.getId()) {
+        if (!(result instanceof MembershipMod) && updated.getId() != original.getId())
{
             throw new IllegalArgumentException("AttributableTO's id must be the same");
         }
         result.setId(updated.getId());


Mime
View raw message