You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/08/23 13:36:19 UTC
svn commit: r988080 - in /myfaces/extensions/cdi/trunk/jee-modules: jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/ jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/

Author: gpetracek
Date: Mon Aug 23 11:36:19 2010
New Revision: 988080

URL: http://svn.apache.org/viewvc?rev=988080&view=rev
Log:
EXTCDI-33 external context

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java?rev=988080&r1=988079&r2=988080&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java Mon Aug 23 11:36:19 2010
@@ -45,6 +45,8 @@ class CodiFacesContextWrapper extends Fa
 {
     private FacesContext wrappedFacesContext;
 
+    private ExternalContext wrappedExternalContext;
+
     private BeanManager beanManager;
 
     private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
@@ -53,6 +55,9 @@ class CodiFacesContextWrapper extends Fa
     {
         this.wrappedFacesContext = wrappedFacesContext;
 
+        this.wrappedExternalContext =
+                new RedirectedConversationAwareExternalContext(wrappedFacesContext.getExternalContext());
+
         setCurrentInstance(this);
         //(currently) causes issue in combination with geronimo 3.0-m1
         init();
@@ -94,7 +99,7 @@ class CodiFacesContextWrapper extends Fa
 
     public ExternalContext getExternalContext()
     {
-        return new RedirectedConversationAwareExternalContext(wrappedFacesContext.getExternalContext());
+        return wrappedExternalContext;
     }
 
     public FacesMessage.Severity getMaximumSeverity()

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java?rev=988080&r1=988079&r2=988080&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java Mon Aug 23 11:36:19 2010
@@ -37,6 +37,8 @@ class CodiFacesContextWrapper extends Fa
 {
     private FacesContext wrappedFacesContext;
 
+    private ExternalContext wrappedExternalContext;
+
     private BeanManager beanManager;
 
     private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
@@ -45,6 +47,9 @@ class CodiFacesContextWrapper extends Fa
     {
         this.wrappedFacesContext = wrappedFacesContext;
 
+        this.wrappedExternalContext =
+                new RedirectedConversationAwareExternalContext(wrappedFacesContext.getExternalContext());
+
         setCurrentInstance(this);
         //(currently) causes issue in combination with geronimo 3.0-m1
         init();
@@ -76,7 +81,7 @@ class CodiFacesContextWrapper extends Fa
 
     public ExternalContext getExternalContext()
     {
-        return new RedirectedConversationAwareExternalContext(wrappedFacesContext.getExternalContext());
+        return wrappedExternalContext;
     }
 
     public void release()