[jboss-cvs] JBossAS SVN: r63202 - branches/Branch_4_2/server/src/main/org/jboss/metadata.

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

Author: dimitris at jboss.org
Date: 2007-05-24 17:31:17 -0400 (Thu, 24 May 2007)
New Revision: 63202

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/metadata/ConfigurationMetaData.java
Log:
JBAS-4444, use the base configuration invoker-proxy-binding-name if it's not specified in the sub-configuration.

Modified: branches/Branch_4_2/server/src/main/org/jboss/metadata/ConfigurationMetaData.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2007-05-24 16:06:28 UTC (rev 63201)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2007-05-24 21:31:17 UTC (rev 63202)
@@ -250,7 +250,7 @@
       securityDomain = getElementContent(getOptionalChild(element, "security-domain"), securityDomain);
    
       //Get configured invokers
-      List invokers=new java.util.ArrayList();
+      List invokers = new java.util.ArrayList();
       
       for (Iterator invokerElements = getChildrenByTagName(element, "invoker-proxy-binding-name"); invokerElements.hasNext();)
       {
@@ -258,8 +258,13 @@
          String invokerName = getElementContent(invokerElement);
          invokers.add(invokerName);
       } // end of for ()
-      invokerNames=(String[]) invokers.toArray(new String[invokers.size()]);
-            
+      
+      // JBAS-4444, override invokers only if they are specified
+      if (invokers.isEmpty() == false)
+      {
+         invokerNames=(String[]) invokers.toArray(new String[invokers.size()]);
+      }
+      
       // set the commit option
       String commit = getElementContent(getOptionalChild(element, "commit-option"), commitOptionToString(commitOption));