costin 01/08/20 21:55:39
Modified: src/share/org/apache/tomcat/core Context.java
ContextManager.java
Log:
2 small changes. In Context, avoid the creation of a log that will be thrown away
a bit later ( which is usefull only to log messages before the context is
initialized)
In context manager make sure we set the tomcat.home property, which is required
in reading the policy file. The shell script is setting it, but if EmbededTomcat
is used we have no way to insure that.
Revision Changes Path
1.149 +2 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- Context.java 2001/08/17 03:59:48 1.148
+++ Context.java 2001/08/21 04:55:39 1.149
@@ -231,8 +231,9 @@
// are servlets allowed to access internal objects?
private boolean trusted=false;
+ private static Log defaultContextLog=Log.getLog("org/apache/tomcat/core",
"Context");
// log channels for context and servlets
- private Log loghelper = Log.getLog("org/apache/tomcat/core", this);
+ private Log loghelper = defaultContextLog;
private Log loghelperServlet;
// servlet API implemented by this Context
1.189 +1 -0
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- ContextManager.java 2001/08/17 03:59:48 1.188
+++ ContextManager.java 2001/08/21 04:55:39 1.189
@@ -250,6 +250,7 @@
*/
public void setHome(String home) {
this.home=home;
+ System.getProperties().put(TOMCAT_HOME, home );
}
public String getHome() {
