commit | 316d6896fed6c969b0f4702aaea643697dedb56b | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Tue Feb 16 10:51:40 2016 +0000 |
committer | Neil Fuller <nfuller@google.com> | Fri Feb 19 18:00:58 2016 +0000 |
tree | 1c9148f96c54e57e0aba7044373c125fb6876fad | |
parent | d8b7db714ff75c37a6fe5b228a1373e9300022f0 [diff] |
Modify Jetty code so it compiles with 1.8 type rules Contains a code change from: https://github.com/eclipse/jetty.project/commit/d89aa3a86615c64edb4bfb861b790d3f818716c5 The change to Request.java is bespoke. Bug: 26753820 (cherry-picked from 806b0b93225bdf4a36d560351642126100e1950e) Change-Id: I5894b3ca0e5fb8af161f0d1880d97d86a6f67070
diff --git a/src/java/org/eclipse/jetty/server/Request.java b/src/java/org/eclipse/jetty/server/Request.java index 4b8c1d4..5ee3717 100644 --- a/src/java/org/eclipse/jetty/server/Request.java +++ b/src/java/org/eclipse/jetty/server/Request.java
@@ -2185,7 +2185,7 @@ 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)); + overridden_query_string.append("&").append(name).append("=").append(LazyList.<String>get(values,i)); } } }
diff --git a/src/java/org/eclipse/jetty/server/handler/ContextHandler.java b/src/java/org/eclipse/jetty/server/handler/ContextHandler.java index 16dec37..0f15749 100644 --- a/src/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/src/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -2331,7 +2331,8 @@ try { - Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className); + @SuppressWarnings({ "unchecked", "rawtypes" }) + Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):(Class)_classLoader.loadClass(className); addListener(clazz); } catch (ClassNotFoundException e)