updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / servlet / Holder.java

diff --git a/lib/jetty/org/eclipse/jetty/servlet/Holder.java b/lib/jetty/org/eclipse/jetty/servlet/Holder.java
index 2f690b17b59c6b0c5fd01dfdb3d4eb2f15795bf3..2c8fa7ba085b872a2ee3b0a7e3c98089bd9aafac 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/servlet/Holder.java
+++ b/lib/jetty/org/eclipse/jetty/servlet/Holder.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


@@ -89,7 +89,7 @@ public class Holder<T> extends BaseHolder<T>
     }
 
     /* ------------------------------------------------------------ */
     }
 
     /* ------------------------------------------------------------ */

-    public Enumeration getInitParameterNames()
+    public Enumeration<String> getInitParameterNames()

     {
         if (_initParams==null)
             return Collections.enumeration(Collections.EMPTY_LIST);
     {
         if (_initParams==null)
             return Collections.enumeration(Collections.EMPTY_LIST);


@@ -227,7 +227,7 @@ public class Holder<T> extends BaseHolder<T>
         }
 
         /* -------------------------------------------------------- */
         }
 
         /* -------------------------------------------------------- */

-        public Enumeration getInitParameterNames()
+        public Enumeration<String> getInitParameterNames()

         {
             return Holder.this.getInitParameterNames();
         }
         {
             return Holder.this.getInitParameterNames();
         }