Author: markt
Date: Wed Dec 4 11:01:46 2013
New Revision: 1547762
URL: http://svn.apache.org/r1547762
Log:
Merge changes from bcel r1521061-1547757
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/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1547760
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1547760
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1521061-1547757
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1547762&r1=1547761&r2=1547762&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Wed
Dec 4 11:01:46 2013
@@ -109,8 +109,8 @@ public interface Constants {
"CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double",
"CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
- "CONSTANT_NameAndType", "CONSTANT_MethodHandle",
- "CONSTANT_MethodType", "CONSTANT_InvokeDynamic" };
+ "CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle",
+ "CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic" };
/** Java VM opcode.
* @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1547762&r1=1547761&r2=1547762&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
Wed Dec 4 11:01:46 2013
@@ -198,18 +198,18 @@ public abstract class Attribute implemen
* @return shallow copy of this attribute
*/
@Override
- public Object clone()
+ public Attribute clone()
{
- Object o = null;
+ Attribute attr = null;
try
{
- o = super.clone();
+ attr = (Attribute) super.clone();
}
catch (CloneNotSupportedException e)
{
- e.printStackTrace(); // Never occurs
+ throw new Error("Clone Not Supported"); // never happens
}
- return o;
+ return attr;
}
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1547762&r1=1547761&r2=1547762&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Wed Dec 4 11:01:46 2013
@@ -86,8 +86,12 @@ public abstract class Constant implement
@Override
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
+ public Constant clone() {
+ try {
+ return (Constant) super.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new Error("Clone Not Supported"); // never happens
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
