svn commit: r826100 - /myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java

[mf...@apache.org]

Author: mfreedman
Date: Fri Oct 16 21:43:49 2009
New Revision: 826100

URL: http://svn.apache.org/viewvc?rev=826100&view=rev
Log:
PORTLETBRIDGE-96: Bridge render handler now checks the session for a (cached) request scope if the request doesn't contain a render parameter reference.

Modified:
    myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=826100&r1=826099&r2=826100&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Fri Oct 16 21:43:49 2009
@@ -716,19 +716,7 @@
       // FacesContext in case anything in the context construction relies
       // on these restored values.
       // don't restore scope if mode changed
-      scopeId = request.getParameter(REQUEST_SCOPE_ID_RENDER_PARAM);
-      if (scopeId != null)
-      {
-        // Its possible we didn't detect the mode change but its the wrong scope
-        // as the scope is encoded with the mode -- confirm its right
-        StringBuffer sb = new StringBuffer(10);
-        String modeCheck = sb.append(":").append(request.getPortletMode().toString()).append(":").toString();
-        if (scopeId.indexOf(modeCheck) < 0 )
-        {
-          // scope is for a different mode
-          scopeId = null;
-        }
-      }
+      scopeId = getRequestScopeId(request);
     }
     
     restoredScope = restoreBridgeRequestScopeData(request, scopeId);