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

[ma...@apache.org]

Author: markt
Date: Tue Nov 25 15:41:18 2014
New Revision: 1641638

URL: http://svn.apache.org/r1641638
Log:
Revert r1625504, 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/tc8.0.x/trunk/   (props changed)
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
    tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

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

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

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1641638&r1=1641637&r2=1641638&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java Tue Nov 25 15:41:18 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/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641638&r1=1641637&r2=1641638&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 25 15:41:18 2014
@@ -53,6 +53,10 @@
         stopped. (markt/kkolinko)
       </fix>
       <fix>
+        <bug>57173</bug>: Rvert the fix for <bug>56953</bug> that broke
+        annotation scanning in some cases. (markt)
+      </fix>
+      <fix>
         <bug>57187</bug>: Regression handling the special * URL. (remm)
       </fix>
       <fix>
@@ -650,9 +654,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org