svn commit: r488572 - /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java

[apetrelli]

Author: apetrelli
Date: Mon Dec 18 23:48:16 2006
New Revision: 488572

URL: http://svn.apache.org/viewvc?view=rev&rev=488572
Log:
SB-102
Applied patch made by Joe Pemberton.
Thanks a lot Joe!

Modified:
    
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java?view=diff&rev=488572&r1=488571&r2=488572
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
 Mon Dec 18 23:48:16 2006
@@ -329,7 +329,7 @@
             throw new NoSuchDefinitionException(msg);
         }
 
-        resolveInheritance(definition, locale);
+        resolveInheritance(parent, locale);
 
         overload(parent, definition);
     }