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

[rmannibucau]

Author: rmannibucau
Date: Thu Nov 24 20:18:14 2011
New Revision: 1205970

URL: http://svn.apache.org/viewvc?rev=1205970&view=rev
Log:
using putall instead of the properties constructor to init properties since it 
can't be available getting entires this way

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java?rev=1205970&r1=1205969&r2=1205970&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
 Thu Nov 24 20:18:14 2011
@@ -41,16 +41,18 @@ public class ActivationConfigPropertyOve
     @Override
     public AppModule deploy(AppModule appModule) throws OpenEJBException {
 
-        final Properties system = new Properties(System.getProperties());
+        final Properties system = new Properties();
         system.putAll(SystemInstance.get().getProperties());
         system.putAll(appModule.getProperties());
+        system.putAll(System.getProperties());
 
         for (EjbModule ejbModule : appModule.getEjbModules()) {
             EjbJar ejbJar = ejbModule.getEjbJar();
             OpenejbJar openejbJar = ejbModule.getOpenejbJar();
 
-            final Properties module = new Properties(system);
+            final Properties module = new Properties();
             module.putAll(openejbJar.getProperties());
+            module.putAll(system);
 
             Map<String, EjbDeployment> deployments = 
openejbJar.getDeploymentsByEjbName();
 
@@ -61,7 +63,8 @@ public class ActivationConfigPropertyOve
 
                 if (!(bean instanceof MessageDrivenBean)) continue;
 
-                final Properties properties = new Properties(module);
+                final Properties properties = new Properties();
+                properties.putAll(module);
                 properties.putAll(ejbDeployment.getProperties());
 
                 final MessageDrivenBean mdb = (MessageDrivenBean) bean;