Merge branch 'master' into cm/bug/classpath-close

# Conflicts:
#	pom.xml
#	src/main/javassist/ByteArrayClassPath.java
#	src/main/javassist/ClassClassPath.java
#	src/main/javassist/ClassPoolTail.java
#	src/main/javassist/LoaderClassPath.java
#	src/main/javassist/URLClassPath.java

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/javassist/compiler/ast/DoubleConst.java b/src/main/javassist/compiler/ast/DoubleConst.java
index 23ff0b65..f8d0afde 100644
--- a/src/main/javassist/compiler/ast/DoubleConst.java
+++ b/src/main/javassist/compiler/ast/DoubleConst.java
@@ -23,6 +23,8 @@ import javassist.compiler.TokenId;
  * Double constant.
  */
 public class DoubleConst extends ASTree {
+    /** default serialVersionUID */
+    private static final long serialVersionUID = 1L;
     protected double value;
     protected int type;
 
@@ -36,8 +38,10 @@ public class DoubleConst extends ASTree {
      */
     public int getType() { return type; }
 
+    @Override
     public String toString() { return Double.toString(value); }
 
+    @Override
     public void accept(Visitor v) throws CompileError {
         v.atDoubleConst(this);
     }
@@ -63,7 +67,7 @@ public class DoubleConst extends ASTree {
     }
 
     private DoubleConst compute0(int op, IntConst right) {
-        return compute(op, this.value, (double)right.value, this.type);
+        return compute(op, this.value, right.value, this.type);
     }
 
     private static DoubleConst compute(int op, double value1, double value2,