[jboss-cvs] JBossAS SVN: r86889 - branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/sso.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-04-06 22:14:40 -0400 (Mon, 06 Apr 2009)
New Revision: 86889

Modified:
   branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
Log:
[JBPAPP-1865] Avoid NPE

Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2009-04-06 22:59:22 UTC (rev 86888)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2009-04-07 02:14:40 UTC (rev 86889)
@@ -23,6 +23,7 @@
 
 import java.io.Serializable;
 import java.security.Principal;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -970,9 +971,10 @@
    private Set getSSOIds() throws Exception
    {
       Fqn ssoRoot = new Fqn(new Object[] {SSO});
-      return (Set) server.invoke(getCacheObjectName(), "getChildrenNames", 
-                                 new Object[]{ ssoRoot }, 
-                                 new String[]{ Fqn.class.getName() });
+      Set ssoIds = (Set) server.invoke(getCacheObjectName(), "getChildrenNames", 
+                                       new Object[]{ ssoRoot }, 
+                                       new String[]{ Fqn.class.getName() });
+      return ssoIds == null ? Collections.emptySet() : ssoIds;
    }
 
    private Fqn getCredentialsFqn(String ssoid)