remm 2002/12/05 04:23:37
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Get a clustered manager if a cluster is associated with the host.
Revision Changes Path
1.11 +10 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardContext.java 29 Nov 2002 14:44:15 -0000 1.10
+++ StandardContext.java 5 Dec 2002 12:23:37 -0000 1.11
@@ -104,6 +104,7 @@
import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.WARDirContext;
import org.apache.naming.resources.DirContextURLStreamHandler;
+import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
@@ -3640,7 +3641,11 @@
if (getManager() == null) { // (3) After prerequisites
if (debug >= 1)
log("Configuring default Manager");
- setManager(new StandardManager());
+ if (getCluster() != null) {
+ setManager(getCluster().createManager(getName()));
+ } else {
+ setManager(new StandardManager());
+ }
}
// Initialize character set mapper
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
