Author: remy.maucherat(a)jboss.com Date: 2008-06-17 06:29:23 -0400 (Tue, 17 Jun 2008) New Revision: 669 Modified: trunk/java/org/apache/catalina/connector/MapperListener.java trunk/java/org/apache/catalina/session/StandardSession.java Log: - Port two minor Tomcat patches. Modified: trunk/java/org/apache/catalina/connector/MapperListener.java =================================================================== --- trunk/java/org/apache/catalina/connector/MapperListener.java 2008-06-12 14:22:50 UTC (rev 668) +++ trunk/java/org/apache/catalina/connector/MapperListener.java 2008-06-17 10:29:23 UTC (rev 669) @@ -26,14 +26,13 @@ import javax.management.ObjectInstance; import javax.management.ObjectName; - - +import org.apache.catalina.core.StandardContext; +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; import org.jboss.logging.Logger; -import org.jboss.logging.Logger; /** @@ -430,6 +429,17 @@ 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)); Modified: trunk/java/org/apache/catalina/session/StandardSession.java =================================================================== --- trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-12 14:22:50 UTC (rev 668) +++ trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-17 10:29:23 UTC (rev 669) @@ -1032,6 +1032,10 @@ throw new IllegalStateException (sm.getString("standardSession.getAttribute.ise")); + if (name == null) { + return null; + } + return (attributes.get(name)); }