commit 6f55a78e2aa4d99346afdb96a08ef077828ec829
author Yohann Roussel <yroussel@google.com> Fri Feb 19 10:54:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 19 10:54:08 2016 +0000
tree 1c9148f96c54e57e0aba7044373c125fb6876fad
parent 806b0b93225bdf4a36d560351642126100e1950e
parent d8b7db714ff75c37a6fe5b228a1373e9300022f0

Ignore debug info of jetty-util prebuilt
am: d8b7db714f

* commit 'd8b7db714ff75c37a6fe5b228a1373e9300022f0':
  Ignore debug info of jetty-util prebuilt

src/java/org/eclipse/jetty/server/Request.java

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));
                         }
                     }
                 }

src/java/org/eclipse/jetty/server/handler/ContextHandler.java

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)