costin 2003/01/31 12:29:24
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Few improvements to loading and reloading of contexts in JMX-mode.
Revision Changes Path
1.19 +22 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StandardContext.java 30 Jan 2003 20:12:12 -0000 1.18
+++ StandardContext.java 31 Jan 2003 20:29:23 -0000 1.19
@@ -3254,7 +3254,9 @@
name = (String) servletMappings.remove(pattern);
}
Wrapper wrapper = (Wrapper) findChild(name);
- wrapper.removeMapping(pattern);
+ if( wrapper != null ) {
+ wrapper.removeMapping(pattern);
+ }
fireContainerEvent("removeServletMapping", pattern);
}
@@ -4682,6 +4684,16 @@
return name;
}
+ public void preDeregister() {
+ if( started ) {
+ try {
+ stop();
+ } catch( Exception ex ) {
+ log.error( "error stopping ", ex);
+ }
+ }
+ }
+
public void init() throws Exception {
if( this.getParent() != null ) {
@@ -4694,12 +4706,17 @@
log.error( "No name attribute " +name );
return;
}
+ if( ! path.startsWith( "//")) {
+ log.error("Invalid name " + name);
+ }
+ path=path.substring(2);
int delim=path.indexOf( "/" );
String hostName="localhost"; // Should be default...
if( delim > 0 ) {
hostName=path.substring(0, delim);
this.setName( path.substring(delim));
} else {
+ log.info("Setting path " + path );
this.setName( path );
}
// XXX The service and domain should be the same.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
