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, 8 deletions

diff --git a/src/main/javassist/bytecode/InnerClassesAttribute.java b/src/main/javassist/bytecode/InnerClassesAttribute.java
index b5b845d7..1bce893b 100644
--- a/src/main/javassist/bytecode/InnerClassesAttribute.java
+++ b/src/main/javassist/bytecode/InnerClassesAttribute.java
@@ -17,8 +17,8 @@
 package javassist.bytecode;
 
 import java.io.DataInputStream;
-import java.util.Map;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * <code>InnerClasses_attribute</code>.
@@ -73,8 +73,7 @@ public class InnerClassesAttribute extends AttributeInfo {
         int i = innerClassIndex(nth);
         if (i == 0)
             return null;
-        else
-            return constPool.getClassInfo(i);
+        return constPool.getClassInfo(i);
     }
 
     /**
@@ -102,8 +101,7 @@ public class InnerClassesAttribute extends AttributeInfo {
         int i = outerClassIndex(nth);
         if (i == 0)
             return null;
-        else
-            return constPool.getClassInfo(i);
+        return constPool.getClassInfo(i);
     }
 
     /**
@@ -131,8 +129,7 @@ public class InnerClassesAttribute extends AttributeInfo {
         int i = innerNameIndex(nth);
         if (i == 0)
             return null;
-        else
-            return constPool.getUtf8Info(i);
+        return constPool.getUtf8Info(i);
     }
 
     /**
@@ -257,7 +254,8 @@ public class InnerClassesAttribute extends AttributeInfo {
      * @param classnames        pairs of replaced and substituted
      *                          class names.
      */
-    public AttributeInfo copy(ConstPool newCp, Map classnames) {
+    @Override
+    public AttributeInfo copy(ConstPool newCp, Map<String,String> classnames) {
         byte[] src = get();
         byte[] dest = new byte[src.length];
         ConstPool cp = getConstPool();