You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/19 08:22:30 UTC

svn commit: r497723 - /incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Author: dblevins
Date: Thu Jan 18 23:22:29 2007
New Revision: 497723

URL: http://svn.apache.org/viewvc?view=rev&rev=497723
Log:
should consult the system instance properties

Modified:
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=497723&r1=497722&r2=497723
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Thu Jan 18 23:22:29 2007
@@ -199,7 +199,8 @@
 
         // Override with system properties
         String prefix = serviceName + ".";
-        Properties sysProps = System.getProperties();
+        Properties sysProps = new Properties(System.getProperties());
+        sysProps.putAll(SystemInstance.get().getProperties());
         for (Iterator iterator1 = sysProps.entrySet().iterator(); iterator1.hasNext();) {
             Map.Entry entry1 = (Map.Entry) iterator1.next();
             String key = (String) entry1.getKey();