Author: kmalhi
Date: Sun Jul 27 16:21:00 2008
New Revision: 680205
URL: http://svn.apache.org/viewvc?rev=680205&view=rev
Log:
OPENEJB-874 SystemInstance is not updated with the properties defined in
conf/system.properties
FIXED this issue
How it was fixed:-
When we read the conf/system.properties , add the properties to SystemInstance
also
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java?rev=680205&r1=680204&r2=680205&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
Sun Jul 27 16:21:00 2008
@@ -86,6 +86,9 @@
InputStream in = new BufferedInputStream(fin);
systemProperties.load(in);
System.getProperties().putAll(systemProperties);
+ // store the system properties inside SystemInstance otherwise
we will lose these properties.
+ // i.e. any piece of code which is trying to look for
properties inside SystemInstance will not be able to find it.
+ SystemInstance.get().getProperties().putAll(systemProperties);
}
} catch (IOException e) {
System.out.println("Processing conf/system.properties failed:
"+e.getMessage());