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, 6 insertions, 3 deletions

diff --git a/src/main/javassist/compiler/ast/NewExpr.java b/src/main/javassist/compiler/ast/NewExpr.java
index b1413f60..44b264c0 100644
--- a/src/main/javassist/compiler/ast/NewExpr.java
+++ b/src/main/javassist/compiler/ast/NewExpr.java
@@ -16,13 +16,15 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * New Expression.
  */
 public class NewExpr extends ASTList implements TokenId {
+    /** default serialVersionUID */
+    private static final long serialVersionUID = 1L;
     protected boolean newArray;
     protected int arrayType;
 
@@ -66,12 +68,13 @@ public class NewExpr extends ASTList implements TokenId {
         ASTree t = getRight().getRight();
         if (t == null)
             return null;
-        else
-            return (ArrayInit)t.getLeft();
+        return (ArrayInit)t.getLeft();
     }
 
+    @Override
     public void accept(Visitor v) throws CompileError { v.atNewExpr(this); }
 
+    @Override
     protected String getTag() {
         return newArray ? "new[]" : "new";
     }