updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / server / session / SessionHandler.java

diff --git a/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.java b/lib/jetty/org/eclipse/jetty/server/session/SessionHandler.java
index e6aedc5b8c9cd2c3aba0e41df5ff334b04e5b13b..f89aaa46adc6bbfeffccc77f2ccdc13f50e5f15d 100644 (file)
--- 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
 //  ------------------------------------------------------------------------
 //  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);
     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;
 
                         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)
                         {
 
                         if (requested_session_id != null)
                         {