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 2017/11/03 10:18:46 UTC
[2/2] syncope git commit: Further changes to ensure querying for
supported ConnId ObjectClasses work propertly
Further changes to ensure querying for supported ConnId ObjectClasses work propertly
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3d4f233c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3d4f233c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3d4f233c
Branch: refs/heads/master
Commit: 3d4f233ccc73dfb68759461abdb75baacaf25d25
Parents: 81a030b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 3 11:18:30 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 3 11:18:39 2017 +0100
----------------------------------------------------------------------
.../org/apache/syncope/core/logic/ConnectorLogic.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d4f233c/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
index d5b2f94..75d704e 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
@@ -21,7 +21,6 @@ package org.apache.syncope.core.logic;
import java.lang.reflect.Method;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -34,7 +33,6 @@ import org.apache.syncope.common.lib.to.ConnBundleTO;
import org.apache.syncope.common.lib.to.ConnIdObjectClassTO;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
-import org.apache.syncope.common.lib.types.ConnConfProperty;
import org.apache.syncope.common.lib.types.StandardEntitlement;
import org.apache.syncope.core.persistence.api.dao.ConnInstanceDAO;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
@@ -209,8 +207,14 @@ public class ConnectorLogic extends AbstractTransactionalLogic<ConnInstanceTO> {
public List<ConnIdObjectClassTO> buildObjectClassInfo(
final ConnInstanceTO connInstanceTO, final boolean includeSpecial) {
+ ConnInstanceTO actual = connInstanceTO;
+ ConnInstance existing = connInstanceDAO.find(connInstanceTO.getKey());
+ if (existing != null) {
+ actual = binder.getConnInstanceTO(existing);
+ }
+
Set<ObjectClassInfo> objectClassInfo = connFactory.createConnector(
- connFactory.buildConnInstanceOverride(connInstanceTO, Collections.<ConnConfProperty>emptySet(), null)).
+ connFactory.buildConnInstanceOverride(actual, connInstanceTO.getConf(), null)).
getObjectClassInfo();
List<ConnIdObjectClassTO> result = new ArrayList<>(objectClassInfo.size());