Author: taylor
Date: Fri Feb 23 13:08:17 2007
New Revision: 511102
URL: http://svn.apache.org/viewvc?view=rev&rev=511102
Log:
bugfix: on redeploy there are times when the PA is null
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?view=diff&rev=511102&r1=511101&r2=511102
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
Fri Feb 23 13:08:17 2007
@@ -329,10 +329,14 @@
for (int i = 0; i < tmpWindows.size(); i++)
{
PortletWindow window =
(PortletWindow)((Map.Entry)tmpWindows.get(i)).getValue();
- MutablePortletApplication windowApp =
(MutablePortletApplication)window.getPortletEntity().getPortletDefinition().getPortletApplicationDefinition();
- if(app.getName().equals(windowApp.getName()))
+ PortletDefinitionComposite pd =
(PortletDefinitionComposite)window.getPortletEntity().getPortletDefinition();
+ if (pd != null)
{
- removeWindow(window);
+ MutablePortletApplication windowApp =
(MutablePortletApplication)pd.getPortletApplicationDefinition();
+ if (app.getName().equals(windowApp.getName()))
+ {
+ removeWindow(window);
+ }
}
}
tmpWindows.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
