updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / util / ClassLoadingObjectInputStream.java

diff --git a/lib/jetty/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java b/lib/jetty/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java
index 5b734db7f4fb68fc37b6048989ef83b74f741ba7..f16e18e620e4ff57da273b7fa8a87a0498f12782 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java
+++ b/lib/jetty/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
 //
 //  ========================================================================

-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.

 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0


@@ -71,10 +71,10 @@ public class ClassLoadingObjectInputStream extends ObjectInputStream
         boolean hasNonPublicInterface = false;
 
         // define proxy in class loader of non-public interface(s), if any
         boolean hasNonPublicInterface = false;
 
         // define proxy in class loader of non-public interface(s), if any

-        Class[] classObjs = new Class[interfaces.length];
+        Class<?>[] classObjs = new Class[interfaces.length];

         for (int i = 0; i < interfaces.length; i++) 
         {
         for (int i = 0; i < interfaces.length; i++) 
         {

-            Class cl = Class.forName(interfaces[i], false, loader);
+            Class<?> cl = Class.forName(interfaces[i], false, loader);

             if ((cl.getModifiers() & Modifier.PUBLIC) == 0) 
             {
                 if (hasNonPublicInterface) 
             if ((cl.getModifiers() & Modifier.PUBLIC) == 0) 
             {
                 if (hasNonPublicInterface)