[jboss-cvs] JBossAS SVN: r104057 - trunk/connector/src/main/java/org/jboss/resource/deployers.

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

Author: emuckenhuber
Date: 2010-04-16 10:13:03 -0400 (Fri, 16 Apr 2010)
New Revision: 104057

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
Log:
don't process MOs twice, otherwise merging might not work

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2010-04-16 14:09:00 UTC (rev 104056)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2010-04-16 14:13:03 UTC (rev 104057)
@@ -150,32 +150,7 @@
    {
       if(isBuildManagedObject())
       {
-         ManagedObject mcfdgMO = managedObjects.get(ManagedConnectionFactoryDeploymentGroup.class.getName());
-         if(mcfdgMO != null)
-         {
-            ManagedProperty deployments = mcfdgMO.getProperty("deployments");
-            MetaType propType = deployments.getMetaType();
-            if (propType.isCollection())
-            {
-               CollectionMetaType amt = (CollectionMetaType) propType;
-               MetaType etype = amt.getElementType();
-               if (etype == AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE)
-               {
-                  CollectionValue avalue = (CollectionValue) deployments.getValue();
-                  if(avalue != null)
-                  {
-                     MetaValue[] elements = avalue.getElements();
-                     for(int n = 0; n < avalue.getSize(); n ++)
-                     {
-                        GenericValue gv = (GenericValue) elements[n];
-                        ManagedObject propMO = (ManagedObject) gv.getValue();
-                        managedObjects.put(propMO.getName(), propMO);
-                     }
-                  }
-               }
-            }
-         }
-
+	// Don't duplicate MOs	
       }
    }
 }