Fixed JDK 8 compilation issues.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index 4b8c1d4..c9dc2f1 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -38,9 +38,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-
import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
import javax.servlet.AsyncListener;
import javax.servlet.DispatcherType;
import javax.servlet.MultipartConfigElement;
@@ -2185,7 +2183,8 @@
Object values = entry.getValue();
for (int i = 0; i < LazyList.size(values); i++)
{
- overridden_query_string.append("&").append(name).append("=").append(LazyList.get(values,i));
+ Object o = LazyList.get(values, i);
+ overridden_query_string.append("&").append(name).append("=").append(String.valueOf(o));
}
}
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index 16dec37..a30557e 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -38,8 +38,10 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
-
import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
@@ -54,9 +56,6 @@
import javax.servlet.ServletRequestListener;
import javax.servlet.SessionCookieConfig;
import javax.servlet.SessionTrackingMode;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.descriptor.JspConfigDescriptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -2331,7 +2330,11 @@
try
{
- Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className);
+ Class<? extends EventListener> clazz;
+ if (_classLoader == null)
+ clazz = Loader.loadClass(ContextHandler.class, className);
+ else
+ clazz = (Class<? extends EventListener>)_classLoader.loadClass(className);
addListener(clazz);
}
catch (ClassNotFoundException e)
