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

Fixes #1039 - AttributeNormalizer should not track null paths

This commit is contained in:
Joakim Erdfelt 2016-10-26 10:31:12 -07:00
parent 7328742ae5
commit c4a8e684c8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java
View File

@ -28,7 +28,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -146,7 +145,20 @@ public class AttributeNormalizer
return o2.weight - o1.weight;
}
}
private static class PathAttributes extends ArrayList<AttributeNormalizer.PathAttribute>
{
@Override
public boolean add(AttributeNormalizer.PathAttribute pathAttribute)
{
if (pathAttribute.path == null)
{
return false;
}
return super.add(pathAttribute);
}
}
public static String uriSeparators(String path)
{
StringBuilder ret = new StringBuilder();
@ -165,7 +177,7 @@ public class AttributeNormalizer
}
private URI warURI;
private List<PathAttribute> attributes = new ArrayList<>();
private PathAttributes attributes = new PathAttributes();
public AttributeNormalizer(Resource baseResource)
{