jford 2004/07/21 16:51:05
Modified: src/java/org/apache/jetspeed/om/registry/base
BasePortletEntry.java
Log:
Prevent stack overflow by retrieving parent properly
Revision Changes Path
1.7 +9 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BasePortletEntry.java
Index: BasePortletEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BasePortletEntry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasePortletEntry.java 20 Jul 2004 04:13:29 -0000 1.6
+++ BasePortletEntry.java 21 Jul 2004 23:51:05 -0000 1.7
@@ -311,7 +311,14 @@
MetaInfo meta = super.getMetaInfo();
if (meta == null)
{
- return getParentEntry().getMetaInfo();
+ if(getParent() != null)
+ {
+ PortletEntry parentEntry = (PortletEntry)Registry.getEntry(
Registry.PORTLET, getParent() );
+ if(parentEntry != null)
+ {
+ return getParentEntry().getMetaInfo();
+ }
+ }
}
return meta;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]