You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/10/31 21:48:31 UTC

svn commit: r1195663 - /tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java

Author: hlship
Date: Mon Oct 31 20:48:30 2011
New Revision: 1195663

URL: http://svn.apache.org/viewvc?rev=1195663&view=rev
Log:
TAP5-1737: Loading all pages using PageCatalog page fails with java.lang.ClassFormatError: Illegal field modifiers in class org/apache/tapestry5/corelib/pages/package-info: 0x12

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java?rev=1195663&r1=1195662&r2=1195663&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java Mon Oct 31 20:48:30 2011
@@ -278,7 +278,9 @@ public class ClassNameLocatorImpl implem
                 {
                     scanDir(packageName + "." + fileName, file, componentClassNames);
                 }
-                else if (fileName.endsWith(CLASS_SUFFIX))
+                // https://issues.apache.org/jira/browse/TAP5-1737
+                // Use of package-info.java leaves these package-info.class files around.
+                else if (fileName.endsWith(CLASS_SUFFIX) && ! fileName.equals("package-info"))
                 {
                     String className = packageName + "." + fileName.substring(0,
                                                                               fileName.length() - CLASS_SUFFIX.length());