Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2023-03-16 18:58:23 +01:00
commit 37d446528b
1 changed files with 5 additions and 3 deletions

View File

@ -932,6 +932,11 @@ public class AnnotationParser
return false; return false;
} }
//get just the last name portion
int ldir = lc.lastIndexOf('/', lc.length());
int c0 = (ldir < 0 ? 0 : ldir + 1);
lc = lc.substring(c0);
if (lc.equals("module-info.class")) if (lc.equals("module-info.class"))
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
@ -940,9 +945,6 @@ public class AnnotationParser
} }
//skip any classfiles that are not a valid java identifier //skip any classfiles that are not a valid java identifier
int c0 = 0;
int ldir = name.lastIndexOf('/', name.length() - 6);
c0 = (ldir > -1 ? ldir + 1 : c0);
if (!Character.isJavaIdentifierStart(name.charAt(c0))) if (!Character.isJavaIdentifierStart(name.charAt(c0)))
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())