Author: markt
Date: Fri Jun 13 13:40:27 2008
New Revision: 667644
URL: http://svn.apache.org/viewvc?rev=667644&view=rev
Log:
Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
There was a short period where the context didn't appear in the mapper that
resulted in some more 404s.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=667644&r1=667643&r2=667644&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Fri Jun
13 13:40:27 2008
@@ -26,11 +26,14 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
+import org.apache.catalina.core.StandardContext;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.mapper.Mapper;
+import org.apache.tomcat.util.http.mapper.MappingData;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -430,6 +433,19 @@
if (contextName.equals("/")) {
contextName = "";
}
+
+ // Don't un-map a context that is paused
+ MessageBytes hostMB = MessageBytes.newInstance();
+ hostMB.setString(hostName);
+ MessageBytes contextMB = MessageBytes.newInstance();
+ contextMB.setString(contextName);
+ MappingData mappingData = new MappingData();
+ mapper.map(hostMB, contextMB, mappingData);
+ if (mappingData.context instanceof StandardContext &&
+ ((StandardContext)mappingData.context).getPaused()) {
+ return;
+ }
+
if(log.isDebugEnabled())
log.debug(sm.getString
("mapperListener.unregisterContext", contextName));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
