svn commit: r1447194 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java

[ilgrosso]

Author: ilgrosso
Date: Mon Feb 18 11:13:25 2013
New Revision: 1447194

URL: http://svn.apache.org/r1447194
Log:
[SYNCOPE-316] Merge from 1_0_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1447181-1447193

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java?rev=1447194&r1=1447193&r2=1447194&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
 Mon Feb 18 11:13:25 2013
@@ -92,7 +92,7 @@ public class ConnectorRestClient extends
     }
 
     public List<ConnBundleTO> getAllBundles() {
-        List<ConnBundleTO> bundles = null;
+        List<ConnBundleTO> bundles = Collections.<ConnBundleTO>emptyList();
 
         try {
             bundles = 
getService(ConnectorService.class).getBundles(SyncopeSession.get().getLocale().toString());