remm 2002/07/10 02:49:01
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
- Make sure the global resources are correctly initialized even if there is no
GlobalNamingResources element in the server.xml.
Revision Changes Path
1.30 +7 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StandardServer.java 11 Jun 2002 19:41:23 -0000 1.29
+++ StandardServer.java 10 Jul 2002 09:49:01 -0000 1.30
@@ -218,6 +218,9 @@
super();
ServerFactory.setServer(this);
+ globalNamingResources = new NamingResources();
+ globalNamingResources.setContainer(this);
+
if (isUseNaming()) {
if (namingContextListener == null) {
namingContextListener = new NamingContextListener();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
