Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-11-13 14:36:35 -0500
committerJoakim Erdfelt2015-12-08 16:55:45 -0500
commite2a20e04652a08ceabe1d6e29f99e9387b7176be (patch)
tree72104a3b52da958f96058efc64fcd28f656d12bf
parent3527c6a71b7247edc8ba92352b706679d958efd7 (diff)
downloadorg.eclipse.jetty.project-e2a20e04652a08ceabe1d6e29f99e9387b7176be.tar.gz
org.eclipse.jetty.project-e2a20e04652a08ceabe1d6e29f99e9387b7176be.tar.xz
org.eclipse.jetty.project-e2a20e04652a08ceabe1d6e29f99e9387b7176be.zip
Using Map interface to get around ConcurrentHashMap.keySet() bug with Java 8
See https://gist.github.com/AlainODea/1375759b8720a3f9f094 for details Conflicts: jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
index ed4987138f..a591fcb6a6 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
@@ -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;
@@ -98,7 +99,7 @@ public class ELContextCleaner implements ServletContextListener
if (!properties.isAccessible())
properties.setAccessible(true);
- ConcurrentHashMap<Class<?>, Object> map = (ConcurrentHashMap<Class<?>, Object>) properties.get(null);
+ Map map = (Map) properties.get(null);
if (map == null)
return;

Back to the top