Author: remy.maucherat(a)jboss.com Date: 2007-09-03 09:52:04 -0400 (Mon, 03 Sep 2007) New Revision: 255 Modified: trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Log: - Add custom instance manager to the servlet context. - Missing findConnectors call. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2007-09-03 13:25:51 UTC (rev 254) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2007-09-03 13:52:04 UTC (rev 255) @@ -4334,6 +4334,8 @@ instanceManager = new DefaultInstanceManager (context, injectionMap, this, this.getClass().getClassLoader()); getServletContext().setAttribute(InstanceManager.class.getName(), instanceManager); + } else { + getServletContext().setAttribute(InstanceManager.class.getName(), instanceManager); } } Modified: trunk/java/org/apache/catalina/core/mbeans-descriptors.xml =================================================================== --- trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 2007-09-03 13:25:51 UTC (rev 254) +++ trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 2007-09-03 13:52:04 UTC (rev 255) @@ -594,6 +594,12 @@ type="org.apache.catalina.connector.Connector"/> </operation> + <operation name="findConnectors" + description="Return the connectors associated with this wrapper" + impact="INFO" + returnType="[Lorg.apache.catalina.connector.Connector;"> + </operation> + <operation name="start" description="Start" impact="ACTION" returnType="void" /> <operation name="stop" description="Stop" impact="ACTION" returnType="void" /> </mbean>