You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/06/10 22:22:49 UTC

svn commit: r666306 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java

Author: hlship
Date: Tue Jun 10 13:22:49 2008
New Revision: 666306

URL: http://svn.apache.org/viewvc?rev=666306&view=rev
Log:
TAPESTRY-2449: Groovy can inject a base class into component classes that Tapestry rejects

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java?rev=666306&r1=666305&r2=666306&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java Tue Jun 10 13:22:49 2008
@@ -131,7 +131,10 @@
         InternalClassTransformation parentTransformation = nameToClassTransformation
                 .get(parentClassname);
 
-        if (parentTransformation == null && !parentClassname.equals(Object.class.getName()))
+        // TAPESTRY-2449: Ignore the base class that Groovy can inject
+
+        if (parentTransformation == null && !(parentClassname.equals("java.lang.Object") || parentClassname.equals(
+                "groovy.lang.GroovyObjectSupport")))
         {
             String suggestedPackageName = buildSuggestedPackageName(classname);