svn commit: r1626994 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/StuckThreadDetectionValve.java java/org/apache/catalina/valves/mbeans-descriptors.xml webapps/docs/changelog.xml

[schultz]

Author: schultz
Date: Tue Sep 23 12:59:44 2014
New Revision: 1626994

URL: http://svn.apache.org/r1626994
Log:
Back-port r1626991 to fix 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57004
Add stuckThreadCount to StuckThreadDetectionValve's JMXBean.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1626991

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1626994&r1=1626993&r2=1626994&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
 Tue Sep 23 12:59:44 2014
@@ -260,6 +260,10 @@ public class StuckThreadDetectionValve e
         }
     }
 
+    public int getStuckThreadCount() {
+        return stuckCount.get();
+    }
+
     public long[] getStuckThreadIds() {
         List<Long> idList = new ArrayList<Long>();
         for (MonitoredThread monitoredThread : activeThreads.values()) {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1626994&r1=1626993&r2=1626994&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml 
Tue Sep 23 12:59:44 2014
@@ -567,6 +567,11 @@
                type="java.lang.String"
                writeable="false"/>
 
+    <attribute name="stuckThreadCount"
+               description="Count of the threads currently considered stuck"
+               type="int"
+               writeable="false"/>
+
     <attribute name="stuckThreadIds"
                description="IDs of the threads currently considered stuck. 
Each ID can then be used with the Threading MBean to retrieve data about it."
                type="long[]"

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1626994&r1=1626993&r2=1626994&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 23 12:59:44 2014
@@ -168,6 +168,11 @@
         paths and are deployed as directories are correctly removed on undeploy
         when running on a case sensitive file system. (markt)
       </fix>
+      <add>
+          <bug>57004</bug>: Add <code>stuckThreadCount</code> property to
+          <code>StuckThreadDetectionValve</code>'s JMX bean. Patch provided by
+          Ji&#x159;&#xED; Pejchal. (schultz)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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