[jboss-cvs] JBossAS SVN: r63203 - trunk/server/src/main/org/jboss/metadata.

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

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

Modified:
   trunk/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: trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2007-05-24 21:31:17 UTC (rev 63202)
+++ trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2007-05-24 21:36:58 UTC (rev 63203)
@@ -1,24 +1,24 @@
 /*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.metadata;
 
 import java.io.Serializable;
@@ -340,7 +340,7 @@
 
       // store-not-flushed
       storeNotFlushed = Boolean.valueOf(getElementContent(getOptionalChild(element, "store-not-flushed"), String.valueOf(storeNotFlushed))).booleanValue();
-
+      
       // set the instance pool
       instancePool = getElementContent(getOptionalChild(element, "instance-pool"), instancePool);
 
@@ -360,7 +360,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();)
       {
@@ -368,8 +368,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));