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

diff --git a/src/main/javassist/util/proxy/ProxyObjectOutputStream.java b/src/main/javassist/util/proxy/ProxyObjectOutputStream.java
index 31c3861b..87351685 100644
--- a/src/main/javassist/util/proxy/ProxyObjectOutputStream.java
+++ b/src/main/javassist/util/proxy/ProxyObjectOutputStream.java
@@ -44,19 +44,20 @@ public class ProxyObjectOutputStream extends ObjectOutputStream
         super(out);
     }
 
+    @Override
     protected void writeClassDescriptor(ObjectStreamClass desc) throws IOException {
-        Class cl = desc.forClass();
+        Class<?> cl = desc.forClass();
         if (ProxyFactory.isProxyClass(cl)) {
             writeBoolean(true);
-            Class superClass = cl.getSuperclass();
-            Class[] interfaces = cl.getInterfaces();
+            Class<?> superClass = cl.getSuperclass();
+            Class<?>[] interfaces = cl.getInterfaces();
             byte[] signature = ProxyFactory.getFilterSignature(cl);
             String name = superClass.getName();
             writeObject(name);
             // we don't write the marker interface ProxyObject
             writeInt(interfaces.length - 1);
             for (int i = 0; i < interfaces.length; i++) {
-                Class interfaze = interfaces[i];
+                Class<?> interfaze = interfaces[i];
                 if (interfaze != ProxyObject.class && interfaze != Proxy.class) {
                     name = interfaces[i].getName();
                     writeObject(name);