Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Joakim Erdfelt 2015-11-13 12:36:35 -07:00
parent 3527c6a71b
commit e2a20e0465
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
View File

@ -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;