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

Improved ClassMatcher/Location behavior. 

+ Reduces need for Resource / ResourceFactory.
+ Corrected path equals logic
This commit is contained in:
Joakim Erdfelt 2022-10-17 15:16:39 -05:00
parent 564275280b
commit f27e4e7273
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/ClassMatcher.java
View File

@ -13,6 +13,7 @@
package org.eclipse.jetty.ee10.webapp;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@ -36,7 +37,6 @@ import org.eclipse.jetty.util.Index;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.resource.ResourceFactory;
/**
* A matcher for classes based on package and/or location and/or module/
@ -131,10 +131,11 @@ public class ClassMatcher extends AbstractSet<String>
protected LocationEntry(String name, boolean inclusive)
{
super(name, inclusive);
if (!getName().startsWith("file:"))
throw new IllegalArgumentException(name);
URI uri = URI.create(name);
if (!uri.isAbsolute() && !"file".equalsIgnoreCase(uri.getScheme()))
throw new IllegalArgumentException("Not a valid file URI: " + name);
_path = ResourceFactory.root().newResource(getName()).getPath();
_path = Paths.get(uri);
}
public Path getPath()
@ -356,12 +357,24 @@ public class ClassMatcher extends AbstractSet<String>
}
else
{
try
{
if (Files.isSameFile(path, entryPath))
{
return true;
}
}
catch (IOException ignore)
{
// this means there is a FileSystem issue preventing comparison.
// Use old technique
if (path.equals(entryPath))
{
return true;
}
}
}
}
return false;
}
}