Author: markt
Date: Fri Sep 12 12:00:17 2014
New Revision: 1624508
URL: http://svn.apache.org/r1624508
Log:
Merge addition of comments from trunk
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/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1397962,1397964,1397969
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1397962,1397964,1397969
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=1624508&r1=1624507&r2=1624508&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
Fri Sep 12 12:00:17 2014
@@ -274,7 +274,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readVersion() throws IOException, ClassFormatException {
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused minor
+ file.readUnsignedShort(); // Unused major
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
Fri Sep 12 12:00:17 2014
@@ -42,10 +42,10 @@ public final class CodeException impleme
* @throws IOException
*/
CodeException(DataInput file) throws IOException {
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused start_pc
+ file.readUnsignedShort(); // Unused end_pc
+ file.readUnsignedShort(); // Unused handler_pc
+ file.readUnsignedShort(); // Unused catch_type
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
Fri Sep 12 12:00:17 2014
@@ -42,8 +42,8 @@ public final class ConstantInvokeDynamic
*/
ConstantInvokeDynamic(DataInput file) throws IOException {
this();
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused bootstrap_method_attr_index
+ file.readUnsignedShort(); // Unused name_and_type_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
Fri Sep 12 12:00:17 2014
@@ -42,8 +42,8 @@ public final class ConstantMethodHandle
*/
ConstantMethodHandle(DataInput file) throws IOException {
this();
- file.readUnsignedByte();
- file.readUnsignedShort();
+ file.readUnsignedByte(); // Unused reference_kind
+ file.readUnsignedShort(); // Unused reference_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
Fri Sep 12 12:00:17 2014
@@ -42,7 +42,7 @@ public final class ConstantMethodType ex
*/
ConstantMethodType(DataInput file) throws IOException {
this();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused descriptor_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
Fri Sep 12 12:00:17 2014
@@ -39,10 +39,10 @@ public final class InnerClass implements
* @throws IOException
*/
InnerClass(DataInput file) throws IOException {
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused inner_class_index
+ file.readUnsignedShort(); // Unused outer_class_index
+ file.readUnsignedShort(); // Unused inner_name_index
+ file.readUnsignedShort(); // Unused inner_access_flags
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
Fri Sep 12 12:00:17 2014
@@ -40,8 +40,8 @@ public final class LineNumber implements
* @throws IOException
*/
LineNumber(DataInput file) throws IOException {
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused start_pc
+ file.readUnsignedShort(); // Unused line_number
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
Fri Sep 12 12:00:17 2014
@@ -41,11 +41,11 @@ public final class LocalVariable impleme
* @throws IOException
*/
LocalVariable(DataInput file) throws IOException {
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused start_pc
+ file.readUnsignedShort(); // Unused length
+ file.readUnsignedShort(); // Unused name_index
+ file.readUnsignedShort(); // Unused signature_index
+ file.readUnsignedShort(); // Unused index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
Fri Sep 12 12:00:17 2014
@@ -43,8 +43,8 @@ public final class PMGClass extends Attr
PMGClass(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, constant_pool);
- file.readUnsignedShort();
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused pmg_index
+ file.readUnsignedShort(); // Unused pmg_class_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
Fri Sep 12 12:00:17 2014
@@ -43,7 +43,7 @@ public final class Signature extends Att
Signature(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, constant_pool);
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused signature_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
Fri Sep 12 12:00:17 2014
@@ -45,7 +45,7 @@ public final class SourceFile extends At
SourceFile(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, constant_pool);
- file.readUnsignedShort();
+ file.readUnsignedShort(); // Unused sourcefile_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
Fri Sep 12 12:00:17 2014
@@ -35,8 +35,8 @@ public final class StackMapEntry impleme
private static final long serialVersionUID = 1L;
StackMapEntry(DataInputStream file) throws IOException {
- file.readShort();
- file.readShort();
+ file.readShort(); // Unused byte_code_offset
+ file.readShort(); // Unused number_of_locals
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1624508&r1=1624507&r2=1624508&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
Fri Sep 12 12:00:17 2014
@@ -41,7 +41,7 @@ public final class StackMapTableEntry im
* @throws IOException
*/
StackMapTableEntry(DataInputStream file) throws IOException {
- file.read();
+ file.read(); // Unused frame_type
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
