Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-09-23 18:41:04 -0400
committerGreg Wilkins2015-09-23 18:41:04 -0400
commit038af01e8ee3448680ffa6367370541d228bffae (patch)
treeec0c7752d0a841755add6fec6319681549174691 /jetty-servlet
parent8c21871cf0ac74ee9569248f3c534e211728b507 (diff)
downloadorg.eclipse.jetty.project-038af01e8ee3448680ffa6367370541d228bffae.tar.gz
org.eclipse.jetty.project-038af01e8ee3448680ffa6367370541d228bffae.tar.xz
org.eclipse.jetty.project-038af01e8ee3448680ffa6367370541d228bffae.zip
478105 prependFilterMapping check for null FilterHolder
Diffstat (limited to 'jetty-servlet')
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index b008dd72d0..45866be65a 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -1287,8 +1287,7 @@ public class ServletHandler extends ScopedHandler
{
if (mapping != null)
{
- Source source = mapping.getFilterHolder().getSource();
-
+ Source source = (mapping.getFilterHolder()==null?null:mapping.getFilterHolder().getSource());
FilterMapping[] mappings = getFilterMappings();
if (mappings==null || mappings.length==0)
{

Back to the top