svnno****@sourc*****
svnno****@sourc*****
2009年 2月 3日 (火) 21:49:55 JST
Revision: 1712
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1712
Author: shinsuke
Date: 2009-02-03 21:49:55 +0900 (Tue, 03 Feb 2009)
Log Message:
-----------
fixed npe.
Modified Paths:
--------------
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2009-02-01 21:17:40 UTC (rev 1711)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2009-02-03 12:49:55 UTC (rev 1712)
@@ -285,8 +285,9 @@
PortletDefinition curPortletDefinition = (PortletDefinition) CurrentWorkerContext
.getAttribute(PortalReservedParameters.PORTLET_DEFINITION_ATTRIBUTE);
- if (!oldPortletDefinition.getId().equals(
- curPortletDefinition.getId()))
+ if (oldPortletDefinition == null
+ || !oldPortletDefinition.getId().equals(
+ curPortletDefinition.getId()))
{
curEntity.setPortletDefinition(curPortletDefinition);
}