You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/18 09:56:24 UTC
svn commit: r326047 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto:
DynamicInformationProviderImpl.java adapter/PortletAdapter.java
Author: cziegeler
Date: Tue Oct 18 00:56:18 2005
New Revision: 326047
URL: http://svn.apache.org/viewcvs?rev=326047&view=rev
Log:
Remove unused thread local
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java?rev=326047&r1=326046&r2=326047&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java Tue Oct 18 00:56:18 2005
@@ -86,9 +86,6 @@
return pm;
}
- /**
- * @see org.apache.pluto.services.information.DynamicInformationProvider#getPreviousPortletMode(org.apache.pluto.om.window.PortletWindow)
- */
public PortletMode getPreviousPortletMode(PortletWindow portletWindow) {
final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
PortletMode pm = (PortletMode) cid.getTemporaryAttribute("previous-portlet-mode");
@@ -107,9 +104,6 @@
return ws;
}
- /**
- * @see org.apache.pluto.services.information.DynamicInformationProvider#getPreviousWindowState(org.apache.pluto.om.window.PortletWindow)
- */
public WindowState getPreviousWindowState(PortletWindow portletWindow) {
final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
WindowState ws = (WindowState) cid.getTemporaryAttribute("previous-window-state");
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=326047&r1=326046&r2=326047&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Tue Oct 18 00:56:18 2005
@@ -83,18 +83,16 @@
extends AbstractCopletAdapter
implements Contextualizable, Initializable, PortalManagerAspect, Receiver, Disposable {
- protected final ThreadLocal copletInstanceData = new InheritableThreadLocal();
-
- /** The avalon context */
+ /** The avalon context. */
protected Context context;
- /** The servlet configuration for pluto */
+ /** The servlet configuration for pluto. */
protected ServletConfig servletConfig;
- /** The Portlet Container */
+ /** The Portlet Container. */
protected PortletContainer portletContainer;
- /** The Portlet Container environment */
+ /** The Portlet Container environment. */
protected PortletContainerEnvironmentImpl portletContainerEnvironment;
/**
@@ -152,7 +150,6 @@
objectModel.put("portlet-request", req);
}
final HttpServletResponse res = (HttpServletResponse) objectModel.get("portlet-response");
- this.copletInstanceData.set(coplet);
try {
this.portletContainer.portletLoad(portletWindow, req.getRequest(portletWindow),
res);
@@ -161,8 +158,6 @@
// remove portlet entity
coplet.removeTemporaryAttribute("window");
((PortletEntityListImpl)pae.getPortletEntityList()).remove(portletEntity);
- } finally {
- this.copletInstanceData.set(null);
}
}
}
@@ -189,8 +184,7 @@
final Map objectModel = ContextHelper.getObjectModel(this.context);
final ServletRequestImpl req = (ServletRequestImpl) objectModel.get("portlet-request");
final HttpServletResponse res = (HttpServletResponse) objectModel.get("portlet-response");
- this.copletInstanceData.set(coplet);
-
+
// TODO - for parallel processing we have to clone the response!
this.portletContainer.renderPortlet(window, req.getRequest(window), res);
final String value = res.toString();
@@ -214,8 +208,6 @@
throw se;
} catch (Exception e) {
throw new SAXException(e);
- } finally {
- this.copletInstanceData.set(null);
}
}