[jboss-cvs] JBossAS SVN: r62519 - branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi.

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

Author: dimitris at jboss.org
Date: 2007-04-24 14:57:45 -0400 (Tue, 24 Apr 2007)
New Revision: 62519

Modified:
   branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/TargetModuleIDImpl.java
Log:
JBAS-4366, javax.enterprise.deploy.spi.TargetModuleID.getChildTargetModuleID() should return null when there are no children

Modified: branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/TargetModuleIDImpl.java
===================================================================
--- branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/TargetModuleIDImpl.java	2007-04-24 17:55:13 UTC (rev 62518)
+++ branches/Branch_4_2/deployment/src/main/org/jboss/deployment/spi/TargetModuleIDImpl.java	2007-04-24 18:57:45 UTC (rev 62519)
@@ -40,11 +40,11 @@
  * module.
  * 
  * @author thomas.diesler at jboss.org
+ * @author dimitris.andreadis at jboss.org
  * @version $Revision$
  */
 public class TargetModuleIDImpl implements TargetModuleID
 {
-
    private TargetModuleIDImpl parentModuleID;
    private List childModuleIDs = new ArrayList();
    private JBossTarget target;
@@ -124,9 +124,17 @@
     */
    public TargetModuleID[] getChildTargetModuleID()
    {
-      TargetModuleID[] idarr = new TargetModuleID[childModuleIDs.size()];
-      childModuleIDs.toArray(idarr);
-      return idarr;
+      int children = childModuleIDs.size();
+      if (children > 0)
+      {
+         TargetModuleID[] idarr = new TargetModuleID[children];
+         childModuleIDs.toArray(idarr);
+         return idarr;
+      }
+      else
+      {
+         return null;
+      }
    }
 
    public void addChildTargetModuleID(TargetModuleID childModuleID)
@@ -162,7 +170,15 @@
 
    public String toString()
    {
+      StringBuffer sbuf = new StringBuffer(128);
+      
       String parentID = (parentModuleID != null ? parentModuleID.moduleID : null);
-      return "[host=" + target.getHostName() + ",parent=" + parentID + ",id=" + moduleID + "]";
+      sbuf.append("[host=").append(target.getHostName());
+      sbuf.append(",id=").append(moduleID);
+      sbuf.append(",parent=").append(parentID);
+      sbuf.append(",children=").append(childModuleIDs);
+      sbuf.append("]");
+      
+      return sbuf.toString();
    }
 }