weaver 2005/03/09 11:34:11
Modified: portal/src/java/org/apache/jetspeed/engine/servlet
ServletRequestImpl.java
Log:
Fixed issue with entities that lacked an assoc. portlet defintion would cause
a nullpointer.
Revision Changes Path
1.36 +12 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
Index: ServletRequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ServletRequestImpl.java 8 Mar 2005 21:59:15 -0000 1.35
+++ ServletRequestImpl.java 9 Mar 2005 19:34:11 -0000 1.36
@@ -40,6 +40,7 @@
import org.apache.pluto.om.entity.PortletApplicationEntity;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.util.Enumerator;
import org.apache.pluto.util.NamespaceMapper;
@@ -70,7 +71,16 @@
super(servletRequest);
nameSpaceMapper = NamespaceMapperAccess.getNamespaceMapper();
this.portletWindow = window;
- webAppId =
portletWindow.getPortletEntity().getPortletDefinition().getPortletApplicationDefinition().getWebApplicationDefinition().getId();
+ PortletDefinition portletDef =
portletWindow.getPortletEntity().getPortletDefinition();
+ if(portletDef != null)
+ {
+ webAppId =
portletDef.getPortletApplicationDefinition().getWebApplicationDefinition().getId();
+ }
+ else
+ {
+ // This happens when an entity is referencing a non-existent
portlet
+ webAppId = window.getId();
+ }
}
protected HttpServletRequest _getHttpServletRequest()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
