portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r592263 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl: PortletRendererImpl.java RenderingJobImpl.java
Date Tue, 06 Nov 2007 04:19:21 GMT
Author: woonsan
Date: Mon Nov  5 20:19:20 2007
New Revision: 592263

URL: http://svn.apache.org/viewvc?rev=592263&view=rev
Log:
[JS2-785] Parallel Rendering on Websphere 6.1
In my previous patch for PortletRendererImpl.java used Collections.synchronizedMap() unnecessarily.
The routine should be centralized into RenderingJobImpl. Also it's better for performance.

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
    portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?rev=592263&r1=592262&r2=592263&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
(original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Mon Nov  5 20:19:20 2007
@@ -21,7 +21,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.List;
-import java.util.Collections;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -500,7 +499,7 @@
         // In case of parallel mode, store attributes in a map to be refered by worker.
         if (isParallel)
         {
-            Map workerAttrs = Collections.synchronizedMap(new HashMap());
+            Map workerAttrs = new HashMap();
             workerAttrs.put(PortalReservedParameters.PAGE_ATTRIBUTE, requestContext.getPage());
             workerAttrs.put(PortalReservedParameters.FRAGMENT_ATTRIBUTE, fragment);
             workerAttrs.put(PortalReservedParameters.CONTENT_DISPATCHER_ATTRIBUTE, dispatcher);

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?rev=592263&r1=592262&r2=592263&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
(original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
Mon Nov  5 20:19:20 2007
@@ -131,11 +131,15 @@
                             PortalStatistics statistics,
                             int expirationCache,
                             boolean contentIsCached,
-                            Map workerAttributes)
+                            Map workerAttrs)
     {
         this(container, renderer, portletDefinition, portletContent, fragment, dispatcher,
                         request, response, requestContext, window, statistics, expirationCache,
contentIsCached);
-        this.workerAttributes = workerAttributes;
+        
+        if (workerAttrs != null)
+        {
+            this.workerAttributes = Collections.synchronizedMap(workerAttrs);
+        }
     }
 
     /**



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


Mime
View raw message