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/12/02 14:03:00 UTC

svn commit: r1041358 - in /myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl: listener/phase/CodiLifecycleWrapper.java scope/conversation/ServerSideWindowHandler.java

Author: gpetracek
Date: Thu Dec  2 13:02:59 2010
New Revision: 1041358

URL: http://svn.apache.org/viewvc?rev=1041358&view=rev
Log:
minor cleanup

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java?rev=1041358&r1=1041357&r2=1041358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java Thu Dec  2 13:02:59 2010
@@ -56,7 +56,8 @@ class CodiLifecycleWrapper extends Lifec
     public void execute(FacesContext facesContext)
             throws FacesException
     {
-        WindowHandler windowHandler = CodiUtils.getOrCreateScopedInstanceOfBeanByClass(WindowHandler.class, false);
+        WindowHandler windowHandler = CodiUtils.getContextualReferenceByClass(WindowHandler.class);
+
         if (windowHandler instanceof LifecycleAwareWindowHandler)
         {
             ((LifecycleAwareWindowHandler) windowHandler).beforeLifecycleExecute(facesContext);

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java?rev=1041358&r1=1041357&r2=1041358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java Thu Dec  2 13:02:59 2010
@@ -44,7 +44,11 @@ public class ServerSideWindowHandler ext
     private static final long serialVersionUID = 4040116087475343221L;
 
     //workaround for mojarra
-    private final boolean useFallback;
+    private boolean useFallback;
+
+    protected ServerSideWindowHandler()
+    {
+    }
 
     @Inject
     protected ServerSideWindowHandler(WindowContextConfig config)