You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/01/11 10:04:51 UTC

svn commit: r1057531 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml container/webapps/docs/changelog.xml

Author: kkolinko
Date: Tue Jan 11 09:04:50 2011
New Revision: 1057531

URL: http://svn.apache.org/viewvc?rev=1057531&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
Expose available property of StandardWrapper via JMX

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1057531&r1=1057530&r2=1057531&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 11 09:04:50 2011
@@ -77,12 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
-  Expose available property of StandardWrapper via JMX
-  http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc5.patch
-  +1: markt, kkolinko, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
   Avoid leak caused by using a cached exception instance
   http://svn.apache.org/viewvc?rev=1044987&view=rev

Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml?rev=1057531&r1=1057530&r2=1057531&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Tue Jan 11 09:04:50 2011
@@ -621,6 +621,10 @@
          group="Wrapper"
          type="org.apache.catalina.core.StandardWrapper">
                
+    <attribute name="available"
+               description="The date and time at which this servlet will become available (in milliseconds since the epoch), or zero if the servlet is available. If this value equals Long.MAX_VALUE, the unavailability of this servlet is considered permanent."
+               type="long"/>  
+
     <attribute name="engineName"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1057531&r1=1057530&r2=1057531&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 11 09:04:50 2011
@@ -56,6 +56,10 @@
   </subsection>
   <subsection name="Catalina">
     <changelog>
+      <add>
+        <bug>43960</bug>: Expose <code>available</code> property of
+        StandardWrapper via JMX. (markt)
+      </add>
       <fix>
         <bug>50131</bug>: Avoid possible NPE in debug output in PersistentValve.
         Patch provided by sebb. (kkolinko)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org