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

Issue #3708 - Correcting for testcases 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-06-12 10:39:05 -05:00
parent 877815e195
commit adb6e7c8d2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -601,13 +601,12 @@ public class AnnotationParser
if (className == null)
return;
String tmp = className;
className = TypeUtil.toClassReference(className);
URL resource = Loader.getResource(className);
String classRef = TypeUtil.toClassReference(className);
URL resource = Loader.getResource(classRef);
if (resource!= null)
{
Resource r = Resource.newResource(resource);
addParsedClass(tmp, r);
addParsedClass(className, r);
try (InputStream is = r.getInputStream())
{
scanClass(handlers, null, is);
@ -673,16 +672,16 @@ public class AnnotationParser
{
MultiException me = new MultiException();
for (String s:classNames)
for (String className : classNames)
{
try
{
String name = TypeUtil.toClassReference(s);
URL resource = Loader.getResource(s);
String classRef = TypeUtil.toClassReference(className);
URL resource = Loader.getResource(classRef);
if (resource!= null)
{
Resource r = Resource.newResource(resource);
addParsedClass(name, r);
addParsedClass(className, r);
try (InputStream is = r.getInputStream())
{
scanClass(handlers, null, is);
@ -691,7 +690,7 @@ public class AnnotationParser
}
catch (Exception e)
{
me.add(new RuntimeException("Error scanning class "+s, e));
me.add(new RuntimeException("Error scanning class "+className, e));
}
}
me.ifExceptionThrow();

4
jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntryUtil.java
View File

@ -240,8 +240,8 @@ public class NamingEntryUtil
return "";
String str = scope.getClass().getName() + "@" + Long.toHexString(scope.hashCode());
// TODO: Is this sanitize step still needed? (this canonicalizeScope method has been reduced in functionality a lot over the years)
str = StringUtil.sanitizeFileSystemName(str);
str = StringUtil.replace(str, '/', '_');
str = StringUtil.replace(str, ' ', '_');
return str;
}
}