remm 2002/06/11 12:41:23
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java StandardContext.java
StandardDefaultContext.java StandardServer.java
Log:
- Set the container object in the NamingResources object.
Revision Changes Path
1.18 +7 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NamingContextListener.java 8 Jun 2002 07:32:42 -0000 1.17
+++ NamingContextListener.java 11 Jun 2002 19:41:23 -0000 1.18
@@ -691,8 +691,10 @@
if (debug >= 1)
log("Creating JNDI naming context");
- if (namingResources == null)
+ if (namingResources == null) {
namingResources = new NamingResources();
+ namingResources.setContainer(container);
+ }
// Resource links
ContextResourceLink[] resourceLinks =
1.108 +5 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- StandardContext.java 8 Jun 2002 07:29:33 -0000 1.107
+++ StandardContext.java 11 Jun 2002 19:41:23 -0000 1.108
@@ -165,6 +165,7 @@
super();
pipeline.setBasic(new StandardContextValve());
+ namingResources.setContainer(this);
}
1.5 +7 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardDefaultContext.java 8 Jun 2002 07:35:06 -0000 1.4
+++ StandardDefaultContext.java 11 Jun 2002 19:41:23 -0000 1.5
@@ -113,6 +113,9 @@
* Create the DefaultContext
*/
public StandardDefaultContext() {
+
+ namingResources.setContainer(this);
+
}
1.29 +5 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StandardServer.java 9 Jun 2002 02:19:42 -0000 1.28
+++ StandardServer.java 11 Jun 2002 19:41:23 -0000 1.29
@@ -388,6 +388,7 @@
NamingResources oldGlobalNamingResources =
this.globalNamingResources;
this.globalNamingResources = globalNamingResources;
+ this.globalNamingResources.setContainer(this);
support.firePropertyChange("globalNamingResources",
oldGlobalNamingResources,
this.globalNamingResources);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
