updating jetty to jetty-9.2.16.v2016040

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

diff --git a/lib/jetty/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/lib/jetty/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
index 81b752887441c3aefac104a1b52d6648f4adab3b..0d07193cf4f698728216517c055619c018752edb 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
+++ b/lib/jetty/org/eclipse/jetty/servlet/listener/ELContextCleaner.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
@@ -20,6 +20,7 @@ package org.eclipse.jetty.servlet.listener;
 
 import java.lang.reflect.Field;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.ServletContextEvent;
@@ -52,7 +53,7 @@ public class ELContextCleaner implements ServletContextListener
         try
         {
             //Check that the BeanELResolver class is on the classpath
-            Class beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver");
+            Class<?> beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver");
 
             //Get a reference via reflection to the properties field which is holding class references
             Field field = getField(beanELResolver);
@@ -60,22 +61,15 @@ public class ELContextCleaner implements ServletContextListener
             //Get rid of references
             purgeEntries(field);
 
-            LOG.debug("javax.el.BeanELResolver purged");
+            if (LOG.isDebugEnabled())
+                LOG.debug("javax.el.BeanELResolver purged");
         }
 
         catch (ClassNotFoundException e)
         {
             //BeanELResolver not on classpath, ignore
         }
-        catch (SecurityException e)
-        {
-            LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e);
-        }
-        catch (IllegalAccessException e)
+        catch (SecurityException | IllegalArgumentException | IllegalAccessException e)
         {
             LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e);
         }
@@ -87,7 +81,7 @@ public class ELContextCleaner implements ServletContextListener
     }
 
 
-    protected Field getField (Class beanELResolver)
+    protected Field getField (Class<?> beanELResolver)
     throws SecurityException, NoSuchFieldException
     {
         if (beanELResolver == null)
@@ -105,22 +99,27 @@ public class ELContextCleaner implements ServletContextListener
         if (!properties.isAccessible())
             properties.setAccessible(true);
 
-        ConcurrentHashMap map = (ConcurrentHashMap) properties.get(null);
+        Map map = (Map) properties.get(null);
         if (map == null)
             return;
 
-        Iterator<Class> itor = map.keySet().iterator();
+        Iterator<Class<?>> itor = map.keySet().iterator();
         while (itor.hasNext())
         {
-            Class clazz = itor.next();
-            LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader());
+            Class<?> clazz = itor.next();
+            if (LOG.isDebugEnabled())
+                LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader());
             if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader()))
             {
                 itor.remove();
-                LOG.debug("removed");
+                if (LOG.isDebugEnabled())
+                    LOG.debug("removed");
             }
             else
-                LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader());
+            {
+                if (LOG.isDebugEnabled())
+                    LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader());
+            }
         }
     }
 }