Author: taylor
Date: Mon Feb 19 15:32:41 2007
New Revision: 509380
URL: http://svn.apache.org/viewvc?view=rev&rev=509380
Log:
check for NPE, reported by VJ Thinker
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?view=diff&rev=509380&r1=509379&r2=509380
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Mon Feb 19 15:32:41 2007
@@ -98,7 +98,6 @@
/**
* OutOfService Cache
*/
- protected Map outOfService = new HashMap(); // todo
protected boolean overrideTitles = false;
public static final String OUT_OF_SERVICE_MESSAGE = "Portlet is not
responding and has been taken out of service.";
@@ -254,6 +253,8 @@
protected int getExpirationCache(PortletDefinitionComposite
portletDefinition)
{
+ if (portletDefinition == null)
+ return 0;
String expiration = portletDefinition.getExpirationCache();
if (expiration == null)
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
