From 399bf89951cc245b7c90c36c11fba1fb1a524bd2 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 19 May 2011 08:49:03 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51230
 Add missing attributes to JMX for ReplicationValve and JvmRouteBinderValve.
 Patch provided by Eiji Takahashi.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1124607 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/ha/session/mbeans-descriptors.xml    |  1 +
 java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml   |  4 +++-
 webapps/docs/changelog.xml                               | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index afb292211..154737a70 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -28,6 +28,7 @@
     <attribute
       name="asyncSupported"
       description="Does this valve support async reporting? "
+      is="true"
       type="boolean"/>
     <attribute
       name="className"
diff --git a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
index 296c964d3..644e07c0d 100644
--- a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
@@ -101,10 +101,12 @@
     <attribute
       name="asyncSupported"
       description="Does this valve support async reporting?"
+      is="true"
       type="boolean"/>
     <attribute
       name="doProcessingStats"
-      is="true"
+      getMethod="doStatistics"
+      setMethod="setStatistics"
       description="active statistics counting"
       type="boolean"/>
     <attribute
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0c25eaa9b..07494b903 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -50,21 +50,29 @@
       </add>
     </changelog>
   </subsection>
-  <subsection name="Other">
+  <subsection name="Cluster">
     <changelog>
       <fix>
-        <bug>46451</bug>: Configure svn:bugtraq properties for Tomcat trunk.
-        Based on a patch provided by Marc Guillemot. (markt)
+        <bug>51230</bug>: Add missing attributes to JMX for ReplicationValve and
+        JvmRouteBinderValve. Patch provided by Eiji Takahashi. (markt)
       </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">
     <changelog>
       <add>
-        Add docs for experimental AJP-NIO connector. (markt/rjung)
+        Add documentation for AJP-NIO connector. (markt/rjung)
       </add>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>46451</bug>: Configure svn:bugtraq properties for Tomcat trunk.
+        Based on a patch provided by Marc Guillemot. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.14 (markt)" rtext="released 2011-05-12">
   <subsection name="Catalina">
-- 
2.11.0