You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2017/12/13 11:41:03 UTC
syncope git commit: [SYNCOPE-1250] fix bad merge
Repository: syncope
Updated Branches:
refs/heads/master a69afb927 -> 3df099689
[SYNCOPE-1250] fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3df09968
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3df09968
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3df09968
Branch: refs/heads/master
Commit: 3df09968936118ce9a36ac438a8d0a6bf498990b
Parents: a69afb9
Author: fmartelli <fa...@gmail.com>
Authored: Wed Dec 13 12:38:27 2017 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Wed Dec 13 12:38:27 2017 +0100
----------------------------------------------------------------------
.../syncope/client/console/wizards/any/AbstractAttrs.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3df09968/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index bae86f1..1ee8f8f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -160,11 +160,11 @@ public abstract class AbstractAttrs<S extends AbstractSchemaTO> extends WizardSt
// 1. remove attributes not selected for display
allSchemas.removeAll(allSchemas.stream().
filter(schemaTO -> !whichAttrs.contains(schemaTO.getKey())).collect(Collectors.toSet()));
-
+ }
+
allSchemas.forEach(schemaTO -> {
scs.put(schemaTO.getKey(), schemaTO);
- });
- }
+ });
}
@Override