myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1079766 - in /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation: DefaultConversation.java JsfWindowContext.java
Date Wed, 09 Mar 2011 12:07:08 GMT
Author: gpetracek
Date: Wed Mar  9 12:07:08 2011
New Revision: 1079766

URL: http://svn.apache.org/viewvc?rev=1079766&view=rev
Log:
EXTCDI-153

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java?rev=1079766&r1=1079765&r2=1079766&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java
Wed Mar  9 12:07:08 2011
@@ -96,7 +96,7 @@ public class DefaultConversation impleme
         this.expirationEvaluator.expire();
         if (this.expirationEvaluator.isExpired())
         {
-            this.active = false;
+            endConversation();
         }
     }
 
@@ -105,16 +105,21 @@ public class DefaultConversation impleme
      */
     public void close()
     {
+        fireCloseConversationEvent();
+
         if(this.active)
         {
-            fireCloseConversationEvent();
-
-            this.active = false;
-            this.beanStorage.resetStorage();
-            RequestCache.resetConversationCache();
+            endConversation();
         }
     }
 
+    private void endConversation()
+    {
+        this.active = false;
+        this.beanStorage.resetStorage();
+        RequestCache.resetConversationCache();
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java?rev=1079766&r1=1079765&r2=1079766&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
Wed Mar  9 12:07:08 2011
@@ -101,6 +101,7 @@ class JsfWindowContext implements Editab
      */
     public void closeConversations()
     {
+        //don't force it because window-scoped beans shouldn't be affected
         closeConversations(false);
     }
 
@@ -236,7 +237,6 @@ class JsfWindowContext implements Editab
 
                 if(!conversation.isActive())
                 {
-                    conversation.close();
                     return this.groupedConversations.remove(conversationKey);
                 }
             }



Mime
View raw message