Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordreis22112016-01-09 14:49:44 +0000
committerdreis22112016-01-09 14:49:44 +0000
commit8dc6e25b894678c11da3489f52235d7fed1d46ab (patch)
treef4e3441acf7ee3085e151d8c412f87465a9004a1
parent9146d1174672df1fe54dbb3971e6023d81da92b5 (diff)
downloadorg.eclipse.jetty.project-8dc6e25b894678c11da3489f52235d7fed1d46ab.tar.gz
org.eclipse.jetty.project-8dc6e25b894678c11da3489f52235d7fed1d46ab.tar.xz
org.eclipse.jetty.project-8dc6e25b894678c11da3489f52235d7fed1d46ab.zip
Removed superfluous condition in ServletHandler.getFilterChain()
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java32
1 files changed, 14 insertions, 18 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 6fd3fbc034..ca5cd3c58f 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
@@ -585,27 +585,23 @@ public class ServletHandler extends ScopedHandler
}
// Servlet name filters
- if (servletHolder != null && _filterNameMappings!=null && _filterNameMappings.size() > 0)
+ if (servletHolder != null && _filterNameMappings!=null && !_filterNameMappings.isEmpty())
{
- // Servlet name filters
- if (_filterNameMappings.size() > 0)
- {
- Object o= _filterNameMappings.get(servletHolder.getName());
+ Object o= _filterNameMappings.get(servletHolder.getName());
- for (int i=0; i<LazyList.size(o);i++)
- {
- FilterMapping mapping = LazyList.get(o,i);
- if (mapping.appliesTo(dispatch))
- filters.add(mapping.getFilterHolder());
- }
+ for (int i=0; i<LazyList.size(o);i++)
+ {
+ FilterMapping mapping = LazyList.get(o,i);
+ if (mapping.appliesTo(dispatch))
+ filters.add(mapping.getFilterHolder());
+ }
- o= _filterNameMappings.get("*");
- for (int i=0; i<LazyList.size(o);i++)
- {
- FilterMapping mapping = LazyList.get(o,i);
- if (mapping.appliesTo(dispatch))
- filters.add(mapping.getFilterHolder());
- }
+ o= _filterNameMappings.get("*");
+ for (int i=0; i<LazyList.size(o);i++)
+ {
+ FilterMapping mapping = LazyList.get(o,i);
+ if (mapping.appliesTo(dispatch))
+ filters.add(mapping.getFilterHolder());
}
}

Back to the top