diff options
| author | Neil Fuller <nfuller@google.com> | 2016-02-16 10:51:40 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-02-16 12:57:04 +0000 |
| commit | 806b0b93225bdf4a36d560351642126100e1950e (patch) | |
| tree | 65c64644c2287ccd40d40bedca350c4bbe1af71a | |
| parent | 7bed9286f5ae2b2fc89dbcdd62cec570e58b99c4 (diff) | |
| download | jetty-806b0b93225bdf4a36d560351642126100e1950e.tar.gz | |
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
Change-Id: Iacf7b94054595370435b2a31b3d62e195a8c7e25
| -rw-r--r-- | src/java/org/eclipse/jetty/server/Request.java | 2 | ||||
| -rw-r--r-- | src/java/org/eclipse/jetty/server/handler/ContextHandler.java | 3 |
2 files changed, 3 insertions, 2 deletions
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 @@ public class Request implements HttpServletRequest 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 @@ public class ContextHandler extends ScopedHandler implements Attributes, Server. 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) |