Issue #1692

jetty · Aug 8, 2017 · e81e17d · e81e17d
1 parent 98eb354
commit e81e17d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
@@ -978,19 +978,26 @@ private boolean isValidClassFileName (String name)
             return false;
 
         //skip anything that is not a class file
-        if (!name.toLowerCase(Locale.ENGLISH).endsWith(".class"))
+        String lc = name.toLowerCase(Locale.ENGLISH);
+        if (!lc.endsWith(".class"))
         {
             if (LOG.isDebugEnabled()) LOG.debug("Not a class: {}",name);
             return false;
         }
+
+        if (lc.equals("module-info.class"))
+        {
+            if (LOG.isDebugEnabled()) LOG.debug("Skipping module-info.class");
+            return false;
+        }
 
         //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 (LOG.isDebugEnabled()) LOG.debug("Not a java identifier: {}"+name);
+            if (LOG.isDebugEnabled()) LOG.debug("Not a java identifier: {}",name);
             return false;
         }