From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 30 Jun 2016 15:46:33 +0000 (+0200)
Subject: Merge branch 'libs/jetty/upstream' into libs/jetty/local
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=065ca60170f2471227dc25784e1a4c3b7912d367

Merge branch 'libs/jetty/upstream' into libs/jetty/local

Change-Id: If35dc415d7d6b78338052a41aebb71ad0ccea0bd
---

065ca60170f2471227dc25784e1a4c3b7912d367
diff --cc doc/scripts/getJetty.sh
index cbec3669,2b1bd950..784a6f1c
--- a/doc/scripts/getJetty.sh
+++ b/doc/scripts/getJetty.sh
@@@ -1,7 -1,8 +1,8 @@@
  #!/bin/sh
+ set -e
  JETTY=C:/jars/jetty-distribution-9.1.0.RC0/org.eclipse.jetty.project
  
 -pushd ../lib/jetty/org/eclipse/jetty
 +pushd ../../lib/jetty/org/eclipse/jetty
  rm -fR *
  
  pushd $JETTY
diff --cc lib/jetty/org/eclipse/jetty/server/handler/ContextHandler.java
index 3a7d9d38,928f850b..23be9f46
--- a/lib/jetty/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/lib/jetty/org/eclipse/jetty/server/handler/ContextHandler.java
@@@ -2193,7 -2212,8 +2212,8 @@@ public class ContextHandler extends Sco
  
              try
              {
+                 @SuppressWarnings("unchecked")
 -                Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className);
 +                Class<? extends EventListener> clazz = (Class<? extends EventListener>) (_classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className));
                  addListener(clazz);
              }
              catch (ClassNotFoundException e)