Author: markt
Date: Wed Sep 17 12:30:32 2014
New Revision: 1625555
URL: http://svn.apache.org/r1625555
Log:
Remove class_name argument from constructor, as Tomcat does not provide the
name.
Port of r1624647 from trunk
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
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/test/org/apache/tomcat/util/bcel/TesterPerformance.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1624647
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1625555&r1=1625554&r2=1625555&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Wed Sep 17 12:30:32 2014
@@ -2067,7 +2067,7 @@ public class ContextConfig implements Li
boolean handlesTypesOnly)
throws ClassFormatException, IOException {
- ClassParser parser = new ClassParser(is, null);
+ ClassParser parser = new ClassParser(is);
JavaClass clazz = parser.parse();
checkHandlesTypes(clazz);
@@ -2226,7 +2226,7 @@ public class ContextConfig implements Li
if (is == null) {
return;
}
- ClassParser parser = new ClassParser(is, null);
+ ClassParser parser = new ClassParser(is);
try {
JavaClass clazz = parser.parse();
populateJavaClassCache(clazz.getClassName(), clazz);
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1624647
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=1625555&r1=1625554&r2=1625555&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
Wed Sep 17 12:30:32 2014
@@ -43,7 +43,6 @@ public final class ClassParser {
private static final int MAGIC = 0xCAFEBABE;
private final DataInputStream file;
- private final String file_name;
private String class_name, superclass_name;
private int access_flags; // Access rights of parsed class
private String[] interface_names; // Names of implemented interfaces
@@ -57,10 +56,8 @@ public final class ClassParser {
* Parse class from the given stream.
*
* @param file Input stream
- * @param file_name File name
*/
- public ClassParser(InputStream file, String file_name) {
- this.file_name = file_name;
+ public ClassParser(InputStream file) {
if (file instanceof DataInputStream) {
this.file = (DataInputStream) file;
} else {
@@ -158,7 +155,7 @@ public final class ClassParser {
}
if (((access_flags & Constants.ACC_ABSTRACT) != 0)
&& ((access_flags & Constants.ACC_FINAL) != 0)) {
- throw new ClassFormatException("Class " + file_name + " can't be
both final and abstract");
+ throw new ClassFormatException("Class can't be both final and
abstract");
}
int class_name_index = file.readUnsignedShort();
@@ -206,7 +203,7 @@ public final class ClassParser {
*/
private void readID() throws IOException, ClassFormatException {
if (file.readInt() != MAGIC) {
- throw new ClassFormatException(file_name + " is not a Java .class
file");
+ throw new ClassFormatException("It is not a Java .class file");
}
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java?rev=1625555&r1=1625554&r2=1625555&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
Wed Sep 17 12:30:32 2014
@@ -58,7 +58,7 @@ public class TesterPerformance {
if (jarEntryName.endsWith(".class")) {
InputStream is = jar.getEntryInputStream();
long start = System.nanoTime();
- ClassParser cp = new ClassParser(is, jarEntryName);
+ ClassParser cp = new ClassParser(is);
cp.parse();
duration += System.nanoTime() - start;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
