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 2008/03/20 01:00:19 UTC
svn commit: r639082 -
/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
Author: dblevins
Date: Wed Mar 19 17:00:16 2008
New Revision: 639082
URL: http://svn.apache.org/viewvc?rev=639082&view=rev
Log:
Merging r636847 - http://svn.apache.org/viewvc?rev=636847&view=rev
svn merge -r 636846:636847 http://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r636847 | kmalhi | 2008-03-13 12:35:27 -0700 (Thu, 13 Mar 2008) | 2 lines
Added system properties to SystemInstance
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?rev=639082&r1=639081&r2=639082&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java Wed Mar 19 17:00:16 2008
@@ -213,7 +213,7 @@
argsList.add(arg);
}
}
-
+ SystemInstance.get().getProperties().putAll(System.getProperties());
args = (String[]) argsList.toArray(new String[argsList.size()]);
return args;
}