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 2011/06/07 20:14:56 UTC
svn commit: r1133120 - in /myfaces/portlet-bridge/core/branches/trunk_2.0.x:
./ impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
Author: mfreedman
Date: Tue Jun 7 18:14:56 2011
New Revision: 1133120
URL: http://svn.apache.org/viewvc?rev=1133120&view=rev
Log:
PORTLETBRIDGE-213: FacesMessages not updated in bridge scope if empty
Modified:
myfaces/portlet-bridge/core/branches/trunk_2.0.x/ (props changed)
myfaces/portlet-bridge/core/branches/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
Propchange: myfaces/portlet-bridge/core/branches/trunk_2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 18:14:56 2011
@@ -1 +1 @@
-/myfaces/portlet-bridge/core/branches/2.0.0-branch:1099967
+/myfaces/portlet-bridge/core/branches/2.0.0-branch:1099967,1131166
Modified: myfaces/portlet-bridge/core/branches/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/branches/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=1133120&r1=1133119&r2=1133120&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/core/branches/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Tue Jun 7 18:14:56 2011
@@ -1797,11 +1797,12 @@ public class BridgeImpl
public void saveFacesMessageState(FacesContext context)
{
+ FacesMessageState state = new FacesMessageState();
+
// get the messages from Faces Context
Iterator<String> clientIds = context.getClientIdsWithMessages();
if (clientIds.hasNext())
{
- FacesMessageState state = new FacesMessageState();
while (clientIds.hasNext())
{
String clientId = (String) clientIds.next();
@@ -1810,10 +1811,9 @@ public class BridgeImpl
state.addMessage(clientId, messages.next());
}
}
- // save state in ViewRoot attributes
- Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
- requestMap.put(FACES_MESSAGES, state);
}
+ Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
+ requestMap.put(FACES_MESSAGES, state);
}
private void restoreFacesMessageState(FacesContext context)