svn commit: r1422798 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java

[rmannibucau]

Author: rmannibucau
Date: Mon Dec 17 08:49:32 2012
New Revision: 1422798

URL: http://svn.apache.org/viewvc?rev=1422798&view=rev
Log:
trying to optimize a bit more MergeWebappJndiContext - pushing against TCKs 
this change ;)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java?rev=1422798&r1=1422797&r2=1422798&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
 Mon Dec 17 08:49:32 2012
@@ -100,15 +100,15 @@ public class MergeWebappJndiContext impl
         }
 
         for (EnterpriseBean a : ejbJar.getEnterpriseBeans()) {
-            merge(a.getEnvEntryMap(), aggregator.getEnvEntryMap());
-            merge(a.getEjbRefMap(), aggregator.getEjbRefMap());
-            merge(a.getEjbLocalRefMap(), aggregator.getEjbLocalRefMap());
-            merge(a.getServiceRefMap(), aggregator.getServiceRefMap());
-            merge(a.getResourceRefMap(), aggregator.getResourceRefMap());
-            merge(a.getResourceEnvRefMap(), aggregator.getResourceEnvRefMap());
-            merge(a.getMessageDestinationRefMap(), 
aggregator.getMessageDestinationRefMap());
-            merge(a.getPersistenceContextRefMap(), 
aggregator.getPersistenceContextRefMap());
-            merge(a.getPersistenceUnitRefMap(), 
aggregator.getPersistenceUnitRefMap());
+            copy(aggregator.getEnvEntryMap(), a.getEnvEntryMap());
+            copy(aggregator.getEjbRefMap(), a.getEjbRefMap());
+            copy(aggregator.getEjbLocalRefMap(), a.getEjbLocalRefMap());
+            copy(aggregator.getServiceRefMap(), a.getServiceRefMap());
+            copy(aggregator.getResourceRefMap(), a.getResourceRefMap());
+            copy(aggregator.getResourceEnvRefMap(), a.getResourceEnvRefMap());
+            copy(aggregator.getMessageDestinationRefMap(), 
a.getMessageDestinationRefMap());
+            copy(aggregator.getPersistenceContextRefMap(), 
a.getPersistenceContextRefMap());
+            copy(aggregator.getPersistenceUnitRefMap(), 
a.getPersistenceUnitRefMap());
 
             mergeUserTransaction(aggregator.getResourceRefMap(), 
a.getResourceRefMap(), a);
             mergeUserTransaction(aggregator.getResourceEnvRefMap(), 
a.getResourceEnvRefMap(), a);