Author: markt
Date: Mon Aug 22 10:15:06 2016
New Revision: 1757134
URL: http://svn.apache.org/viewvc?rev=1757134&view=rev
Log:
Updating Tomcat's copy of BCEL as far as HEAD (including 6.0 and some post 6.0
fixes that are NO-OPs for our fork)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 10:15:06 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 10:15:06 2016
@@ -1,4 +1,4 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910
-/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1743695
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1757132
+/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1747272
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
-/tomcat/trunk/java/org/apache/tomcat/util/bcel:1743696
+/tomcat/trunk/java/org/apache/tomcat/util/bcel:1743696,1757123-1757124,1757126,1757128,1757132-1757133
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
Mon Aug 22 10:15:06 2016
@@ -22,8 +22,8 @@ public class AnnotationElementValue exte
// For annotation element values, this is the annotation
private final AnnotationEntry annotationEntry;
- AnnotationElementValue(int type, AnnotationEntry annotationEntry,
- ConstantPool cpool)
+ AnnotationElementValue(final int type, final AnnotationEntry
annotationEntry,
+ final ConstantPool cpool)
{
super(type, cpool);
if (type != ANNOTATION) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Mon Aug 22 10:15:06 2016
@@ -41,12 +41,12 @@ public class AnnotationEntry {
* @param constant_pool
* @throws IOException
*/
- AnnotationEntry(DataInput input, ConstantPool constant_pool) throws
IOException {
+ AnnotationEntry(final DataInput input, final ConstantPool constant_pool)
throws IOException {
this.constant_pool = constant_pool;
type_index = input.readUnsignedShort();
- int num_element_value_pairs = input.readUnsignedShort();
+ final int num_element_value_pairs = input.readUnsignedShort();
element_value_pairs = new ArrayList<>(num_element_value_pairs);
for (int i = 0; i < num_element_value_pairs; i++) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Mon Aug 22 10:15:06 2016
@@ -31,7 +31,7 @@ public class Annotations {
* @param input Input stream
* @param constant_pool Array of constants
*/
- Annotations(DataInput input, ConstantPool constant_pool) throws
IOException {
+ Annotations(final DataInput input, final ConstantPool constant_pool)
throws IOException {
final int annotation_table_length = input.readUnsignedShort();
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
Mon Aug 22 10:15:06 2016
@@ -22,7 +22,7 @@ public class ArrayElementValue extends E
// For array types, this is the array
private final ElementValue[] evalues;
- ArrayElementValue(int type, ElementValue[] datums, ConstantPool cpool)
+ ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool)
{
super(type, cpool);
if (type != ARRAY) {
@@ -35,7 +35,7 @@ public class ArrayElementValue extends E
@Override
public String stringifyValue()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("[");
for (int i = 0; i < evalues.length; i++)
{
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
Mon Aug 22 10:15:06 2016
@@ -26,7 +26,7 @@ public class ClassElementValue extends E
// For 'class' this points to the class entry in the cpool
private final int idx;
- ClassElementValue(int type, int idx, ConstantPool cpool) {
+ ClassElementValue(final int type, final int idx, final ConstantPool cpool)
{
super(type, cpool);
this.idx = idx;
}
@@ -35,7 +35,7 @@ public class ClassElementValue extends E
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(idx,
+ final ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(idx,
Const.CONSTANT_Utf8);
return cu8.getBytes();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
Mon Aug 22 10:15:06 2016
@@ -31,7 +31,7 @@ public class ClassFormatException extend
}
- public ClassFormatException(String s) {
+ public ClassFormatException(final String s) {
super(s);
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Mon Aug 22 10:15:06 2016
@@ -56,7 +56,7 @@ public final class ClassParser {
*
* @param inputStream Input stream
*/
- public ClassParser(InputStream inputStream) {
+ public ClassParser(final InputStream inputStream) {
this.dataInputStream = new DataInputStream(new
BufferedInputStream(inputStream, BUFSIZE));
}
@@ -106,7 +106,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readAttributes() throws IOException, ClassFormatException {
- int attributes_count = dataInputStream.readUnsignedShort();
+ final int attributes_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < attributes_count; i++) {
ConstantUtf8 c;
String name;
@@ -181,7 +181,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readFields() throws IOException, ClassFormatException {
- int fields_count = dataInputStream.readUnsignedShort();
+ final int fields_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < fields_count; i++) {
Utility.swallowFieldOrMethod(dataInputStream);
}
@@ -208,7 +208,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readInterfaces() throws IOException, ClassFormatException {
- int interfaces_count = dataInputStream.readUnsignedShort();
+ final int interfaces_count = dataInputStream.readUnsignedShort();
if (interfaces_count > 0) {
interface_names = new String[interfaces_count];
for (int i = 0; i < interfaces_count; i++) {
@@ -227,7 +227,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readMethods() throws IOException, ClassFormatException {
- int methods_count = dataInputStream.readUnsignedShort();
+ final int methods_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < methods_count; i++) {
Utility.swallowFieldOrMethod(dataInputStream);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Mon Aug 22 10:15:06 2016
@@ -42,7 +42,7 @@ public abstract class Constant {
protected final byte tag;
- Constant(byte tag) {
+ Constant(final byte tag) {
this.tag = tag;
}
@@ -62,9 +62,9 @@ public abstract class Constant {
* @param input Input stream
* @return Constant object
*/
- static Constant readConstant(DataInput input) throws IOException,
+ static Constant readConstant(final DataInput input) throws IOException,
ClassFormatException {
- byte b = input.readByte(); // Read tag byte
+ final byte b = input.readByte(); // Read tag byte
int skipSize;
switch (b) {
case Const.CONSTANT_Class:
@@ -101,7 +101,6 @@ public abstract class Constant {
}
-
@Override
public String toString() {
return "[" + tag + "]";
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
Mon Aug 22 10:15:06 2016
@@ -39,7 +39,7 @@ public final class ConstantClass extends
* @param file Input stream
* @throws IOException
*/
- ConstantClass(DataInput file) throws IOException {
+ ConstantClass(final DataInput file) throws IOException {
super(Const.CONSTANT_Class);
this.name_index = file.readUnsignedShort();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
Mon Aug 22 10:15:06 2016
@@ -39,7 +39,7 @@ public final class ConstantDouble extend
* @param file Input stream
* @throws IOException
*/
- ConstantDouble(DataInput file) throws IOException {
+ ConstantDouble(final DataInput file) throws IOException {
super(Const.CONSTANT_Double);
this.bytes = file.readDouble();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
Mon Aug 22 10:15:06 2016
@@ -39,7 +39,7 @@ public final class ConstantFloat extends
* @param file Input stream
* @throws IOException
*/
- ConstantFloat(DataInput file) throws IOException {
+ ConstantFloat(final DataInput file) throws IOException {
super(Const.CONSTANT_Float);
this.bytes = file.readFloat();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
Mon Aug 22 10:15:06 2016
@@ -39,7 +39,7 @@ public final class ConstantInteger exten
* @param file Input stream
* @throws IOException
*/
- ConstantInteger(DataInput file) throws IOException {
+ ConstantInteger(final DataInput file) throws IOException {
super(Const.CONSTANT_Integer);
this.bytes = file.readInt();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Mon Aug 22 10:15:06 2016
@@ -39,7 +39,7 @@ public final class ConstantLong extends
* @param file Input stream
* @throws IOException
*/
- ConstantLong(DataInput input) throws IOException {
+ ConstantLong(final DataInput input) throws IOException {
super(Const.CONSTANT_Long);
this.bytes = input.readLong();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Mon Aug 22 10:15:06 2016
@@ -44,8 +44,8 @@ public class ConstantPool {
* @throws IOException
* @throws ClassFormatException
*/
- ConstantPool(DataInput input) throws IOException, ClassFormatException {
- int constant_pool_count = input.readUnsignedShort();
+ ConstantPool(final DataInput input) throws IOException,
ClassFormatException {
+ final int constant_pool_count = input.readUnsignedShort();
constant_pool = new Constant[constant_pool_count];
/* constant_pool[0] is unused by the compiler and may be used freely
* by the implementation.
@@ -76,7 +76,7 @@ public class ConstantPool {
* @return Constant value
* @see Constant
*/
- public Constant getConstant( int index ) {
+ public Constant getConstant( final int index ) {
if (index >= constant_pool.length || index < 0) {
throw new ClassFormatException("Invalid constant pool reference: "
+ index
+ ". Constant pool size is: " + constant_pool.length);
@@ -95,7 +95,7 @@ public class ConstantPool {
* @see Constant
* @throws ClassFormatException If the constant is not of the expected
type
*/
- public Constant getConstant( int index, byte tag ) throws
ClassFormatException {
+ public Constant getConstant( final int index, final byte tag ) throws
ClassFormatException {
Constant c;
c = getConstant(index);
if (c == null) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Mon Aug 22 10:15:06 2016
@@ -33,7 +33,7 @@ public final class ConstantUtf8 extends
private final String bytes;
- static ConstantUtf8 getInstance(DataInput input) throws IOException {
+ static ConstantUtf8 getInstance(final DataInput input) throws IOException {
return new ConstantUtf8(input.readUTF());
}
@@ -41,7 +41,7 @@ public final class ConstantUtf8 extends
/**
* @param bytes Data
*/
- private ConstantUtf8(String bytes) {
+ private ConstantUtf8(final String bytes) {
super(Const.CONSTANT_Utf8);
if (bytes == null) {
throw new IllegalArgumentException("bytes must not be null!");
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
Mon Aug 22 10:15:06 2016
@@ -26,7 +26,7 @@ public abstract class ElementValue
private final ConstantPool cpool;
- ElementValue(int type, ConstantPool cpool) {
+ ElementValue(final int type, final ConstantPool cpool) {
this.type = type;
this.cpool = cpool;
}
@@ -47,9 +47,9 @@ public abstract class ElementValue
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValue readElementValue(DataInput input, ConstantPool
cpool) throws IOException
+ public static ElementValue readElementValue(final DataInput input, final
ConstantPool cpool) throws IOException
{
- byte type = input.readByte();
+ final byte type = input.readByte();
switch (type)
{
case PRIMITIVE_BYTE:
@@ -75,8 +75,8 @@ public abstract class ElementValue
return new AnnotationElementValue(ANNOTATION, new
AnnotationEntry(input, cpool), cpool);
case ARRAY:
- int numArrayVals = input.readUnsignedShort();
- ElementValue[] evalues = new ElementValue[numArrayVals];
+ final int numArrayVals = input.readUnsignedShort();
+ final ElementValue[] evalues = new ElementValue[numArrayVals];
for (int j = 0; j < numArrayVals; j++)
{
evalues[j] = ElementValue.readElementValue(input, cpool);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
Mon Aug 22 10:15:06 2016
@@ -35,7 +35,7 @@ public class ElementValuePair
private final int elementNameIndex;
- ElementValuePair(DataInput file, ConstantPool constantPool) throws
IOException {
+ ElementValuePair(final DataInput file, final ConstantPool constantPool)
throws IOException {
this.constantPool = constantPool;
this.elementNameIndex = file.readUnsignedShort();
this.elementValue = ElementValue.readElementValue(file, constantPool);
@@ -43,7 +43,7 @@ public class ElementValuePair
public String getNameString()
{
- ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
+ final ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
elementNameIndex, Const.CONSTANT_Utf8);
return c.getBytes();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
Mon Aug 22 10:15:06 2016
@@ -23,7 +23,7 @@ public class EnumElementValue extends El
{
private final int valueIdx;
- EnumElementValue(int type, int valueIdx, ConstantPool cpool) {
+ EnumElementValue(final int type, final int valueIdx, final ConstantPool
cpool) {
super(type, cpool);
if (type != ENUM_CONSTANT)
throw new RuntimeException(
@@ -34,7 +34,7 @@ public class EnumElementValue extends El
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(valueIdx,
+ final ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(valueIdx,
Const.CONSTANT_Utf8);
return cu8.getBytes();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Mon Aug 22 10:15:06 2016
@@ -43,9 +43,9 @@ public class JavaClass {
* @param interfaces Implemented interfaces
* @param runtimeVisibleAnnotations "RuntimeVisibleAnnotations" attribute
defined on the Class, or null
*/
- JavaClass(String class_name, String superclass_name,
- int access_flags, ConstantPool constant_pool, String[]
interface_names,
- Annotations runtimeVisibleAnnotations) {
+ JavaClass(final String class_name, final String superclass_name,
+ final int access_flags, final ConstantPool constant_pool, final
String[] interface_names,
+ final Annotations runtimeVisibleAnnotations) {
this.access_flags = access_flags;
this.runtimeVisibleAnnotations = runtimeVisibleAnnotations;
this.class_name = class_name;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Mon Aug 22 10:15:06 2016
@@ -23,7 +23,7 @@ public class SimpleElementValue extends
{
private final int index;
- SimpleElementValue(int type, int index, ConstantPool cpool) {
+ SimpleElementValue(final int type, final int index, final ConstantPool
cpool) {
super(type, cpool);
this.index = index;
}
@@ -41,47 +41,47 @@ public class SimpleElementValue extends
@Override
public String stringifyValue()
{
- ConstantPool cpool = super.getConstantPool();
+ final ConstantPool cpool = super.getConstantPool();
final int _type = super.getType();
switch (_type)
{
case PRIMITIVE_INT:
- ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(),
+ final ConstantInteger c = (ConstantInteger)
cpool.getConstant(getIndex(),
Const.CONSTANT_Integer);
return Integer.toString(c.getBytes());
case PRIMITIVE_LONG:
- ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(),
+ final ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(),
Const.CONSTANT_Long);
return Long.toString(j.getBytes());
case PRIMITIVE_DOUBLE:
- ConstantDouble d = (ConstantDouble) cpool.getConstant(getIndex(),
+ final ConstantDouble d = (ConstantDouble)
cpool.getConstant(getIndex(),
Const.CONSTANT_Double);
return Double.toString(d.getBytes());
case PRIMITIVE_FLOAT:
- ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex(),
+ final ConstantFloat f = (ConstantFloat)
cpool.getConstant(getIndex(),
Const.CONSTANT_Float);
return Float.toString(f.getBytes());
case PRIMITIVE_SHORT:
- ConstantInteger s = (ConstantInteger) cpool.getConstant(getIndex(),
+ final ConstantInteger s = (ConstantInteger)
cpool.getConstant(getIndex(),
Const.CONSTANT_Integer);
return Integer.toString(s.getBytes());
case PRIMITIVE_BYTE:
- ConstantInteger b = (ConstantInteger) cpool.getConstant(getIndex(),
+ final ConstantInteger b = (ConstantInteger)
cpool.getConstant(getIndex(),
Const.CONSTANT_Integer);
return Integer.toString(b.getBytes());
case PRIMITIVE_CHAR:
- ConstantInteger ch = (ConstantInteger) cpool.getConstant(
+ final ConstantInteger ch = (ConstantInteger) cpool.getConstant(
getIndex(), Const.CONSTANT_Integer);
return String.valueOf((char)ch.getBytes());
case PRIMITIVE_BOOLEAN:
- ConstantInteger bo = (ConstantInteger) cpool.getConstant(
+ final ConstantInteger bo = (ConstantInteger) cpool.getConstant(
getIndex(), Const.CONSTANT_Integer);
if (bo.getBytes() == 0) {
return "false";
}
return "true";
case STRING:
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(),
+ final ConstantUtf8 cu8 = (ConstantUtf8)
cpool.getConstant(getIndex(),
Const.CONSTANT_Utf8);
return cu8.getBytes();
default:
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Mon Aug 22 10:15:06 2016
@@ -40,11 +40,11 @@ final class Utility {
* @param str The long class name
* @return Compacted class name
*/
- static String compactClassName(String str) {
+ static String compactClassName(final String str) {
return str.replace('/', '.'); // Is `/' on all systems, even DOS
}
- static String getClassName(ConstantPool constant_pool, int index) {
+ static String getClassName(final ConstantPool constant_pool, final int
index) {
Constant c = constant_pool.getConstant(index, Const.CONSTANT_Class);
int i = ((ConstantClass) c).getNameIndex();
@@ -55,14 +55,14 @@ final class Utility {
return compactClassName(name);
}
- static void skipFully(DataInput file, int length) throws IOException {
+ static void skipFully(final DataInput file, final int length) throws
IOException {
int total = file.skipBytes(length);
if (total != length) {
throw new EOFException();
}
}
- static void swallowFieldOrMethod(DataInput file)
+ static void swallowFieldOrMethod(final DataInput file)
throws IOException {
// file.readUnsignedShort(); // Unused access flags
// file.readUnsignedShort(); // name index
@@ -75,7 +75,7 @@ final class Utility {
}
}
- static void swallowAttribute(DataInput file)
+ static void swallowAttribute(final DataInput file)
throws IOException {
//file.readUnsignedShort(); // Unused name index
skipFully(file, 2);
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1757134&r1=1757133&r2=1757134&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Aug 22 10:15:06 2016
@@ -274,6 +274,10 @@
<fix>
Fixed typos in mbeans-descriptors.xml files. (violetagg)
</fix>
+ <update>
+ Update the internal fork of Commons BCEL to r1757132 to align with the
+ BCEL 6 release. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
