[jboss-svn-commits] JBL Code SVN: r27272 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/helpers and 1 other directory.

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

Author: beve
Date: 2009-06-29 00:39:00 -0400 (Mon, 29 Jun 2009)
New Revision: 27272

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/ConfigTreeUnitTest.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2650 "ConfigTree's getWholeText can throw NPE if child tree is empty"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java	2009-06-29 04:08:08 UTC (rev 27271)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java	2009-06-29 04:39:00 UTC (rev 27272)
@@ -293,12 +293,10 @@
     public String getWholeText() {
         if (null == _childs)
             return "";
-        StringBuilder sb = null;
+        StringBuilder sb = new StringBuilder();
         for (Child child : _childs) {
             if (!(child._obj instanceof String))
                 continue;
-            if (null == sb)
-                sb = new StringBuilder((String) child._obj);
             else
                 sb.append((String) child._obj);
         }

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/ConfigTreeUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/ConfigTreeUnitTest.java	2009-06-29 04:08:08 UTC (rev 27271)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/ConfigTreeUnitTest.java	2009-06-29 04:39:00 UTC (rev 27272)
@@ -294,4 +294,18 @@
         assertEquals(123123.123123f, configTree.getFloatAttribute("v4", 123123.123123f));
         assertEquals(false, configTree.getBooleanAttribute("v4", false));
     }
+    
+    public void test_getWholeText()
+    {
+        final ConfigTree configTree = new ConfigTree("test");
+        new ConfigTree("child", configTree);
+        try
+        {
+            configTree.getWholeText();
+        }
+        catch (final NullPointerException e)
+        {
+            fail("getWholeText should not throw NPE if child is empty: "  + e.getClass().getName());
+        }
+    }
 }