You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/10/25 17:43:37 UTC

svn commit: r467682 - /portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java

Author: taylor
Date: Wed Oct 25 08:43:37 2006
New Revision: 467682

URL: http://svn.apache.org/viewvc?view=rev&rev=467682
Log:
patch from Nicolas Dutertry
fixes bug in portlet pipeline where PSML preferences are ignored

Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java?view=diff&rev=467682&r1=467681&r2=467682
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java Wed Oct 25 08:43:37 2006
@@ -20,17 +20,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.aggregator.ContentDispatcher;
 import org.apache.jetspeed.aggregator.PortletAggregator;
 import org.apache.jetspeed.aggregator.PortletRenderer;
 import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.headerresource.HeaderResource;
-import org.apache.jetspeed.headerresource.HeaderResourceFactory;
 import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.ContentFragmentImpl;
+import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.request.RequestContext;
 
 /**
@@ -75,9 +72,13 @@
         {
             return;
         }
-        PortletAggregatorFragmentImpl fragment = new PortletAggregatorFragmentImpl(entity);
-        fragment.setType(Fragment.PORTLET);
-        fragment.setName(name);
+        Fragment fragment = context.getPage().getFragmentById(entity);
+        if (fragment == null) 
+        {        
+            fragment = new PortletAggregatorFragmentImpl(entity);        
+            fragment.setType(Fragment.PORTLET);
+            fragment.setName(name);
+        }
         //String decorator = fragment.getDecorator();
         ContentDispatcher dispatcher = renderer.getDispatcher(context, false);
         ContentFragment contentFragment = new ContentFragmentImpl(fragment, new HashMap());



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org