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

svn commit: r610929 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/modeler/ManagedBean.java webapps/docs/changelog.xml

Author: markt
Date: Thu Jan 10 13:04:31 2008
New Revision: 610929

URL: http://svn.apache.org/viewvc?rev=610929&view=rev
Log:
Fix bug 43868. MBean methods getInvoke and getSetter were broken.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=610929&r1=610928&r2=610929&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 13:04:31 2008
@@ -31,12 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match the dir structure
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43868
-  MBean methods getInvoke() and getSetter() were broken
-  http://svn.apache.org/viewvc?rev=607483&view=rev
-  +1: markt, jim, fhanik, pero
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43840
   Include user principal if possible when serializing / de-serializing
   http://people.apache.org/~markt/dev/bug43840.txt

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=610929&r1=610928&r2=610929&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Thu Jan 10 13:04:31 2008
@@ -542,7 +542,7 @@
             Object object = null;
             NoSuchMethodException exception = null;
             try {
-                object = this;
+                object = bean;
                 m = object.getClass().getMethod(setMethod, signature);
             } catch (NoSuchMethodException e) {
                 exception = e;;
@@ -601,7 +601,7 @@
             Object object = null;
             Exception exception = null;
             try {
-                object = this;
+                object = bean;
                 method = object.getClass().getMethod(aname, types);
             } catch (NoSuchMethodException e) {
                 exception = e;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=610929&r1=610928&r2=610929&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 10 13:04:31 2008
@@ -89,6 +89,9 @@
         <bug>43675</bug>: Fix a possible logging related classloader leak.
         (markt)
       </fix>
+      <fix><bug>43687</bug> Remove conditional headers on Form Auth replay, 
+           since the UA (esp. FireFox) isn't expecting it.
+      </fix>
       <fix>
         <bug>43706</bug>: WebDAV copy/move now returns 201 on success. Based on
         a patch by Panagiotis Astithas. (markt)
@@ -105,8 +108,9 @@
         Improve the webDAV Servlet Javadocs to make clear that the WebDAV
         Servlet can not be used as the default servlet. (markt)
       </update>
-      <fix><bug>43687</bug> Remove conditional headers on Form Auth replay, 
-           since the UA (esp. FireFox) isn't expecting it.
+      <fix>
+        <bug>43868</bug>: MBean methods getInvoke and getSetter were broken.
+        (markt)
       </fix>
       <fix>
         <bug>43993</bug>: mime mapping for WS-Policy. Patch by Fabian Ritzmann  (funkman)



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