[jboss-cvs] JBossAS SVN: r61781 - trunk/cluster/src/main/org/jboss/ha/framework/server.

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

Author: jerrygauth
Date: 2007-03-28 09:14:30 -0400 (Wed, 28 Mar 2007)
New Revision: 61781

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java
Log:
Fixed NPE's.

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java	2007-03-28 13:05:08 UTC (rev 61780)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java	2007-03-28 13:14:30 UTC (rev 61781)
@@ -155,6 +155,9 @@
    {
       StringBuffer result = new StringBuffer ();
       Collection cats = this.getAllCategories ();
+      if (cats == null)
+         return result.toString();
+      
       Iterator catsIter = cats.iterator ();
       while (catsIter.hasNext ())
       {
@@ -182,30 +185,32 @@
    public String listXmlContent () throws Exception
    {
       StringBuffer result = new StringBuffer ();
+      result.append ("<DistributedState>\n");      
       Collection cats = this.getAllCategories ();
-      Iterator catsIter = cats.iterator ();
-
-      result.append ("<DistributedState>\n");
-
-      while (catsIter.hasNext ())
+      if (cats != null)
       {
-         String category = (String)catsIter.next ();
-         Iterator keysIter = this.getAllKeys(category).iterator ();
+         Iterator catsIter = cats.iterator ();
+         while (catsIter.hasNext ())
+         {
+            String category = (String)catsIter.next ();
+            Iterator keysIter = this.getAllKeys(category).iterator ();
 
-         result.append ("\t<Logger>\n");
-         result.append ("\t\t<LoggerName>").append (category).append ("</LoggerName>\n");
+            result.append ("\t<Logger>\n");
+            result.append ("\t\t<LoggerName>").append (category).append ("</LoggerName>\n");
 
-         while (keysIter.hasNext ())
-         {
-            Serializable key = (Serializable) keysIter.next ();
-            String value = this.get (category, key).toString ();
-            result.append ("\t\t<Entry>\n");
-            result.append ("\t\t\t<Key>").append (key).append ("</Key>\n");
-            result.append ("\t\t\t<Value>").append (value).append ("</Value>\n");
-            result.append ("\t\t</Entry>\n");
+            while (keysIter.hasNext ())
+            {
+               Serializable key = (Serializable) keysIter.next ();
+               String value = this.get (category, key).toString ();
+               result.append ("\t\t<Entry>\n");
+               result.append ("\t\t\t<Key>").append (key).append ("</Key>\n");
+               result.append ("\t\t\t<Value>").append (value).append ("</Value>\n");
+               result.append ("\t\t</Entry>\n");
+            }
+            result.append ("\t</Logger>\n");
          }
-         result.append ("\t</Logger>\n");
       }
+
       result.append ("</DistributedState>\n");
 
       return result.toString ();