You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/07/29 17:43:36 UTC
svn commit: r980480 -
/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
Author: mfreedman
Date: Thu Jul 29 15:43:35 2010
New Revision: 980480
URL: http://svn.apache.org/viewvc?rev=980480&view=rev
Log:
PORTLETBRIDGE-157: NullPointerException from Bridge encodeActionUrl when use portlet: syntax
Modified:
myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java?rev=980480&r1=980479&r2=980480&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java Thu Jul 29 15:43:35 2010
@@ -329,7 +329,7 @@ public class PortletExternalContextImpl
// the current render params
queryStr.removeParameter(Bridge.FACES_VIEW_ID_PARAMETER);
}
- else if (s != null && s1.equals(Bridge.FACES_USE_CURRENT_VIEW_PARAMETER))
+ else if (s1 != null && s1.equals(Bridge.FACES_USE_CURRENT_VIEW_PARAMETER))
{
isPortletURLSelfReference = true;
// by removing the parameter we will rely on retaining the current view info based on \