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 at...@apache.org on 2010/10/16 04:16:22 UTC
svn commit: r1023169 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java
pom.xml
Author: ate
Date: Sat Oct 16 02:16:22 2010
New Revision: 1023169
URL: http://svn.apache.org/viewvc?rev=1023169&view=rev
Log:
JS2-1222: Nested Portlet servlet include dispatch is failing for a ResourceRequest on Websphere 6.1.0.23 when targeting a filter (like WicketFilter)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java?rev=1023169&r1=1023168&r2=1023169&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java Sat Oct 16 02:16:22 2010
@@ -281,8 +281,8 @@ public class PortletRequestContextImpl i
public Object getAttribute(String name)
{
- Object value = servletRequest.getAttribute(name);
- return value != null ? value : window.getAttribute(name);
+ Object value = window.getAttribute(name);
+ return value != null ? value : servletRequest.getAttribute(name);
}
@SuppressWarnings("unchecked")
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1023169&r1=1023168&r2=1023169&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Sat Oct 16 02:16:22 2010
@@ -283,7 +283,7 @@
<myfaces.version>1.1.5</myfaces.version>
<ojb.version>1.0.3</ojb.version>
<org.apache.derby.version>10.3.2.1</org.apache.derby.version>
- <org.apache.pluto.version>2.0.2</org.apache.pluto.version>
+ <org.apache.pluto.version>2.0.3-SNAPSHOT</org.apache.pluto.version>
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
<org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org