This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new d3281b9 Update BCEL. No functional change.
d3281b9 is described below
commit d3281b91591b288c875596e10b22ac2ce71feab7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 1 20:42:50 2019 +0100
Update BCEL. No functional change.
---
.../tomcat/util/bcel/classfile/ClassParser.java | 20 ++++++++++----------
.../apache/tomcat/util/bcel/classfile/Constant.java | 3 ---
.../tomcat/util/bcel/classfile/ConstantPool.java | 9 +++------
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 3 ---
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index a43080a..4ff1427 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -52,7 +52,7 @@ public final class ClassParser {
private static final String[] INTERFACES_EMPTY_ARRAY = new String[0];
/**
- * Parse class from the given stream.
+ * Parses class from the given stream.
*
* @param inputStream Input stream
*/
@@ -62,7 +62,7 @@ public final class ClassParser {
/**
- * Parse the given Java class file and return an object that represents
+ * Parses the given Java class file and return an object that represents
* the contained data, i.e., constants, methods, fields and commands.
* A <em>ClassFormatException</em> is raised, if the file is not a valid
* .class file. (This does not include verification of the byte code as it
@@ -101,7 +101,7 @@ public final class ClassParser {
/**
- * Read information about the attributes of the class.
+ * Reads information about the attributes of the class.
* @throws IOException
* @throws ClassFormatException
*/
@@ -135,7 +135,7 @@ public final class ClassParser {
/**
- * Read information about the class and its super class.
+ * Reads information about the class and its super class.
* @throws IOException
* @throws ClassFormatException
*/
@@ -166,7 +166,7 @@ public final class ClassParser {
/**
- * Read constant pool entries.
+ * Reads constant pool entries.
* @throws IOException
* @throws ClassFormatException
*/
@@ -176,7 +176,7 @@ public final class ClassParser {
/**
- * Read information about the fields of the class, i.e., its variables.
+ * Reads information about the fields of the class, i.e., its variables.
* @throws IOException
* @throws ClassFormatException
*/
@@ -190,7 +190,7 @@ public final class ClassParser {
/******************** Private utility methods **********************/
/**
- * Check whether the header of the file is ok.
+ * Checks whether the header of the file is ok.
* Of course, this has to be the first action on successive file reads.
* @throws IOException
* @throws ClassFormatException
@@ -203,7 +203,7 @@ public final class ClassParser {
/**
- * Read information about the interfaces implemented by this class.
+ * Reads information about the interfaces implemented by this class.
* @throws IOException
* @throws ClassFormatException
*/
@@ -222,7 +222,7 @@ public final class ClassParser {
/**
- * Read information about the methods of the class.
+ * Reads information about the methods of the class.
* @throws IOException
* @throws ClassFormatException
*/
@@ -235,7 +235,7 @@ public final class ClassParser {
/**
- * Read major and minor version of compiler which created the file.
+ * Reads major and minor version of compiler which created the file.
* @throws IOException
* @throws ClassFormatException
*/
diff --git a/java/org/apache/tomcat/util/bcel/classfile/Constant.java
b/java/org/apache/tomcat/util/bcel/classfile/Constant.java
index c235f44..fd39e62 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/Constant.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/Constant.java
@@ -41,12 +41,10 @@ public abstract class Constant {
*/
protected final byte tag;
-
Constant(final byte tag) {
this.tag = tag;
}
-
/**
* @return Tag of constant, i.e., its type. No setTag() method to avoid
* confusion.
@@ -55,7 +53,6 @@ public abstract class Constant {
return tag;
}
-
/**
* Read one constant from the given input, the type depends on a tag byte.
*
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index e03378c..bf441f8 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -36,9 +36,8 @@ public class ConstantPool {
private final Constant[] constant_pool;
-
/**
- * Read constants from given input stream.
+ * Reads constants from given input stream.
*
* @param input Input stream
* @throws IOException
@@ -68,9 +67,8 @@ public class ConstantPool {
}
}
-
/**
- * Get constant from constant pool.
+ * Gets constant from constant pool.
*
* @param index Index in constant pool
* @return Constant value
@@ -84,9 +82,8 @@ public class ConstantPool {
return constant_pool[index];
}
-
/**
- * Get constant from constant pool and check whether it has the
+ * Gets constant from constant pool and check whether it has the
* expected type.
*
* @param index Index in constant pool
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
index e654804..0e2e965 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
@@ -32,12 +32,10 @@ public final class ConstantUtf8 extends Constant {
private final String bytes;
-
static ConstantUtf8 getInstance(final DataInput input) throws IOException {
return new ConstantUtf8(input.readUTF());
}
-
/**
* @param bytes Data
*/
@@ -49,7 +47,6 @@ public final class ConstantUtf8 extends Constant {
this.bytes = bytes;
}
-
/**
* @return Data converted to string.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
