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/jetty-9.2.x' into jetty-9.3.x

This commit is contained in:
Greg Wilkins 2016-09-08 10:38:54 +10:00
parent 28ca70378e ada58ea65a
commit 3a42455411
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExcludeSet.java
View File

@ -67,10 +67,10 @@ public class IncludeExcludeSet<P,T> implements Predicate<T>
/**
* Construct an IncludeExclude.
* <p>
* If the {@link Set} class also implements {@link Predicate}, then that Predicate is
* used to match against the set, otherwise a simple {@link Set#contains(Object)} test is used.
* @param setClass The type of {@link Set} to using internally
* @param setClass The type of {@link Set} to using internally to hold patterns. Two instances will be created.
* one for include patterns and one for exclude patters. If the class is also a {@link Predicate},
* then it is also used as the item test for the set, otherwise a {@link SetContainsPredicate} instance
* is created.
* @param <SET> The type of a set to use as the backing store
*/
public <SET extends Set<P>> IncludeExcludeSet(Class<SET> setClass)
@ -89,9 +89,12 @@ public class IncludeExcludeSet<P,T> implements Predicate<T>
_includePredicate = new SetContainsPredicate(_includes);
}
if(_excludes instanceof Predicate) {
if(_excludes instanceof Predicate)
{
_excludePredicate = (Predicate<T>)_excludes;
} else {
}
else
{
_excludePredicate = new SetContainsPredicate(_excludes);
}
}