svn commit: r1641641 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ClassParser.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Nov 25 15:45:58 2014
New Revision: 1641641

URL: http://svn.apache.org/r1641641
Log:
Revert r1625559, the fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56953 and an attempt to 
enhance performance of annotation scanning.
The FastDataInputStream class was broken and caused multiple reports of 
regressions (https://issues.apache.org/bugzilla/show_bug.cgi?id=57173)

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1641634
  Merged /tomcat/tc8.0.x/trunk:r1641638

Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
  Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1641634
  Merged /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel:r1641638

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1641641&r1=1641640&r2=1641641&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 Tue Nov 25 15:45:58 2014
@@ -17,7 +17,9 @@
  */
 package org.apache.tomcat.util.bcel.classfile;
 
+import java.io.BufferedInputStream;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -57,7 +59,7 @@ public final class ClassParser {
      * @param file Input stream
      */
     public ClassParser(InputStream file) {
-        this.file = new FastDataInputStream(file, BUFSIZE);
+        this.file = new DataInputStream(new BufferedInputStream(file, 
BUFSIZE));
     }
 
 

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=1641641&r1=1641640&r2=1641641&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 25 15:45:58 2014
@@ -59,6 +59,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>57173</bug>: Rvert the fix for <bug>56953</bug> that broke
+        annotation scanning in some cases. (markt)
+      </fix>
+      <fix>
         <bug>57208</bug>: Prevent NPE in JNDI Realm when no results are found
         in a directory context for a user with specified user name. Based on
         a patch provided by Jason McIntosh. (violetagg)
@@ -433,9 +437,9 @@
         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)
+        <bug>57004</bug>: Add <code>stuckThreadCount</code> property to
+        <code>StuckThreadDetectionValve</code>'s JMX bean. Patch provided by
+        Ji&#x159;&#xED; Pejchal. (schultz)
       </add>
       <fix>
         <bug>57011</bug>: Ensure that the request and response are correctly



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