cedric 01/10/08 06:36:36
Modified: contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition
XmlDefinition.java
Log:
Correct bug "definition path not overloaded when extending definition"
Revision Changes Path
1.3 +5 -2
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java
Index: XmlDefinition.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlDefinition.java 2001/09/28 17:05:22 1.2
+++ XmlDefinition.java 2001/10/08 13:36:36 1.3
@@ -127,8 +127,11 @@
if( !getAttributes().containsKey(name) )
putAttribute( name, parent.getAttribute(name) );
}
- // Set path
- setPath( parent.getPath() );
+ // Set path and role if not setted
+ if( path == null )
+ setPath( parent.getPath() );
+ if( role == null )
+ setRole( parent.getRole() );
}
/**
