Merge branch 'libs/jetty/upstream' into libs/jetty/local
authorFelix Dörre <felix@dogcraft.de>
Thu, 30 Jun 2016 15:46:33 +0000 (17:46 +0200)
committerFelix Dörre <felix@dogcraft.de>
Thu, 30 Jun 2016 15:46:33 +0000 (17:46 +0200)
Change-Id: If35dc415d7d6b78338052a41aebb71ad0ccea0bd

1  2 
doc/scripts/getJetty.sh
lib/jetty/org/eclipse/jetty/io/ssl/SslConnection.java
lib/jetty/org/eclipse/jetty/server/SslConnectionFactory.java
lib/jetty/org/eclipse/jetty/server/handler/ContextHandler.java

index cbec36691e84bacaf622003f6a76970166c13c9e,2b1bd95021464efdaba84618eb9ac40b34c46a89..784a6f1cb9f8a38c191689890801b1516cca7ba2
@@@ -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
index 3a7d9d38b819bb7528f5740a35f9b494e9c1f94a,928f850b06aaba27004f638a46d29665645fd743..23be9f4632528246224b1889e8c60e7d9c1e7ff1
@@@ -2193,7 -2212,8 +2212,8 @@@ public class ContextHandler extends Sco
  
              try
              {
 -                Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className);
+                 @SuppressWarnings("unchecked")
 +                Class<? extends EventListener> clazz = (Class<? extends EventListener>) (_classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className));
                  addListener(clazz);
              }
              catch (ClassNotFoundException e)