openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r774523 - /incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
Date Wed, 13 May 2009 20:49:00 GMT
Author: gerdogdu
Date: Wed May 13 20:49:00 2009
New Revision: 774523

URL: http://svn.apache.org/viewvc?rev=774523&view=rev
Log:
Update for M2 after testing. Correction of some bugs in the context tests.

Modified:
    incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java

Modified: incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=774523&r1=774522&r2=774523&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
Wed May 13 20:49:00 2009
@@ -48,7 +48,7 @@
                 String cid = JSFUtil.getExternalContext().getRequestParameterMap().get("cid");
 
                 // non-faces get request
-                if (cid == null)
+                if (cid == null || cid.equals(""))
                 {
                     logger.info("Create new transitional conversation for non-faces request
with view id : " + JSFUtil.getViewId());
                     
@@ -122,6 +122,7 @@
                 logger.info("Conversation with id : " + conversation.getId() + " is marked
as long running conversation");
                 
                 context.setActive(false);
+                
             }
 
             // else destroy conversation context
@@ -171,6 +172,8 @@
                 UIViewRoot viewRoot = JSFUtil.getViewRoot();
                 
                 viewRoot.getAttributes().put(CONVERSATION_ATTR_ID, conversation.getId());
+                
+                JSFUtil.getExternalContext().getRequestMap().put("cid",conversation.getId());
             }
             else
             {



Mime
View raw message