X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fjetty%2Forg%2Feclipse%2Fjetty%2Fserver%2Fsession%2FSessionHandler.java;fp=lib%2Fjetty%2Forg%2Feclipse%2Fjetty%2Fserver%2Fsession%2FSessionHandler.java;h=f89aaa46adc6bbfeffccc77f2ccdc13f50e5f15d;hb=065ca60170f2471227dc25784e1a4c3b7912d367;hp=e6aedc5b8c9cd2c3aba0e41df5ff334b04e5b13b;hpb=ad7a401ad98da5a8a33e60d39789e941aa8ccfc4;p=gigi.git

diff --git a/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.java b/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.java
index e6aedc5b..f89aaa46 100644
--- a/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.java
+++ b/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.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
@@ -49,10 +49,12 @@ public class SessionHandler extends ScopedHandler
     final static Logger LOG = Log.getLogger("org.eclipse.jetty.server.session");
 
     public final static EnumSet<SessionTrackingMode> DEFAULT_TRACKING = EnumSet.of(SessionTrackingMode.COOKIE,SessionTrackingMode.URL);
-    
-    public static final Class[] SESSION_LISTENER_TYPES = new Class[] {HttpSessionAttributeListener.class,
-                                                                      HttpSessionIdListener.class,
-                                                                      HttpSessionListener.class};
+
+    @SuppressWarnings("unchecked")
+    public static final Class<? extends EventListener>[] SESSION_LISTENER_TYPES = 
+        new Class[] {HttpSessionAttributeListener.class,
+                     HttpSessionIdListener.class,
+                     HttpSessionListener.class};
 
 
 
@@ -262,7 +264,8 @@ public class SessionHandler extends ScopedHandler
                         requested_session_id = cookies[i].getValue();
                         requested_session_id_from_cookie = true;
 
-                        LOG.debug("Got Session ID {} from cookie",requested_session_id);
+                        if (LOG.isDebugEnabled())
+                            LOG.debug("Got Session ID {} from cookie",requested_session_id);
 
                         if (requested_session_id != null)
                         {