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

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

Author: bstansberry at jboss.com
Date: 2008-04-28 15:15:14 -0400 (Mon, 28 Apr 2008)
New Revision: 72794

Modified:
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
Log:
[JBAS-5492] Avoid NPE in dead member cleaner

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2008-04-28 19:04:18 UTC (rev 72793)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2008-04-28 19:15:14 UTC (rev 72794)
@@ -970,9 +970,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 ? new HashSet() : ssoIds;
    }
 
    private Fqn getCredentialsFqn(String ssoid)