Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into servlet-3.1-api

This commit is contained in:
Jan Bartel 2013-06-18 08:37:49 +10:00
parent d87df5d89e d3645ac28c
commit 31082e1f8e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
View File

@ -509,7 +509,7 @@ public class ServletContextHandler extends ContextHandler
setSessionHandler((SessionHandler) handler); setSessionHandler((SessionHandler) handler);
else if (handler instanceof SecurityHandler) else if (handler instanceof SecurityHandler)
setSecurityHandler((SecurityHandler)handler); setSecurityHandler((SecurityHandler)handler);
else if (handler instanceof HandlerWrapper) else if (handler == null || handler instanceof HandlerWrapper)
{ {
super.setHandler(handler); super.setHandler(handler);
relinkHandlers(); relinkHandlers();

1
pom.xml
View File

@ -775,3 +775,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>