svn commit: r1607713 - /portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java

Author: taylor
Date: Thu Jul  3 18:49:08 2014
New Revision: 1607713

URL: http://svn.apache.org/r1607713
Log:
JS2-1298: ensure that fragments always have an id, in cases where portlet pipeline or JPT dynamically create fragments. This fixes bug with portlet preferences not reading or storing correctly with instantly created portlets via JPT or portlet pipeline

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?rev=1607713&r1=1607712&r2=1607713&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java Thu Jul  3 18:49:08 2014
@@ -16,16 +16,6 @@
  */
 package org.apache.jetspeed.om.window.impl;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.WindowState;
-
 import org.apache.commons.collections.list.TreeList;
 import org.apache.jetspeed.aggregator.PortletContent;
 import org.apache.jetspeed.aggregator.RenderTrackable;
@@ -42,6 +32,15 @@ import org.apache.jetspeed.util.KeyValue
 import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletResponseContext;
 
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.WindowState;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <P>
  * The <CODE>PortletWindow</CODE> implementation represents a single window
@@ -92,6 +91,9 @@ public class PortletWindowImpl implement
         this.requestContext = requestContext;
         this.id = fragment.getId();
         this.portletEntityId = fragment.getFragmentId();
+        if (this.portletEntityId == null) {
+            this.portletEntityId = this.id;
+        }
         this.fragment = fragment;
         this.pd = pd;
         this.valid = pd != null;