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 2013/02/18 16:17:29 UTC
svn commit: r1447309 -
/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Author: ilgrosso
Date: Mon Feb 18 15:17:29 2013
New Revision: 1447309
URL: http://svn.apache.org/r1447309
Log:
Making more robust connector schema names handling
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java?rev=1447309&r1=1447308&r2=1447309&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java Mon Feb 18 15:17:29 2013
@@ -185,16 +185,16 @@ public class ConnectorRestClient extends
}
public List<String> getSchemaNames(final ConnInstanceTO connectorTO) {
- List<String> schemaNames = null;
+ List<String> schemaNames = new ArrayList<String>();
try {
- schemaNames = Arrays.asList(SyncopeSession.get().getRestTemplate().postForObject(
- baseURL + "connector/schema/list", connectorTO, String[].class));
-
- // re-order schema names list
- Collections.sort(schemaNames);
+ schemaNames.addAll(Arrays.asList(SyncopeSession.get().getRestTemplate().postForObject(
+ baseURL + "connector/schema/list", connectorTO, String[].class)));
} catch (Exception e) {
LOG.error("While getting resource schema names", e);
+ } finally {
+ // re-order schema names list
+ Collections.sort(schemaNames);
}
return schemaNames;