tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r672011 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/MapperListener.java
Date Thu, 26 Jun 2008 19:45:29 GMT
Author: fhanik
Date: Thu Jun 26 12:45:29 2008
New Revision: 672011

URL: http://svn.apache.org/viewvc?rev=672011&view=rev
Log:
apply patch

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=672011&r1=672010&r2=672011&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 12:45:29 2008
@@ -49,13 +49,6 @@
   +1: markt, remm, fhanik
   -1: 
 
-* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
-  JMX re-registration was causing the context to briefly disappear from the
-  mapper during reload causing 404s
-  http://svn.apache.org/viewvc?rev=667644&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
   Map.entrySet() should return entries, not values
   http://svn.apache.org/viewvc?rev=668849&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=672011&r1=672010&r2=672011&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java Thu Jun 26
12:45:29 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message