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/07/24 06:16:25 UTC
svn commit: r978794 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/
Author: gpetracek
Date: Sat Jul 24 04:16:23 2010
New Revision: 978794
URL: http://svn.apache.org/viewvc?rev=978794&view=rev
Log:
reverted #967306 and unified recording of old view-id
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/InterceptedResponseWriter.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java?rev=978794&r1=978793&r2=978794&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java Sat Jul 24 04:16:23 2010
@@ -88,13 +88,13 @@ public abstract class AbstractConversati
}
//workaround for weld - end
- WindowContextManager conversationManager = resolveWindowContextManager();
+ WindowContextManager windowContextManager = resolveWindowContextManager();
Bean<T> bean = ((Bean<T>) component);
BeanEntry<T> beanEntry = new ConversationBeanEntry<T>(creationalContext, bean);
- scopeBeanEntry(conversationManager, beanEntry);
+ scopeBeanEntry(windowContextManager, beanEntry);
return beanEntry.getBeanInstance();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.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/scope/conversation/BeanStorage.java?rev=978794&r1=978793&r2=978794&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java Sat Jul 24 04:16:23 2010
@@ -81,15 +81,13 @@ class BeanStorage implements Serializabl
{
oldBeanInstance = beanHolder.resetBeanInstance();
fireUnscopeBeanEvent(oldBeanInstance, beanHolder);
- beanHolder.getBean().destroy(oldBeanInstance, beanHolder.getCreationalContext());
+ destroyBean(beanHolder.getCreationalContext(), beanHolder.getBean(), oldBeanInstance);
}
}
private <T extends Serializable> void fireUnscopeBeanEvent(T instance, BeanEntry<T> beanHolder)
{
getOrCreateBeanManager().fireEvent(new UnscopeBeanEvent(instance));
-
- destroyBean(beanHolder.getCreationalContext(), beanHolder.getBean(), instance);
}
private BeanManager getOrCreateBeanManager()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.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/scope/conversation/DefaultWindowContextManager.java?rev=978794&r1=978793&r2=978794&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java Sat Jul 24 04:16:23 2010
@@ -30,9 +30,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.request.RequestTypeResolver;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils;
-import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.resolveWindowContextId;
-import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.restoreInformationOfRequest;
-import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.cacheWindowId;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.*;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.EditableWindowContext;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectHandler;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
@@ -106,6 +104,11 @@ public class DefaultWindowContextManager
cleanupInactiveConversations();
}
+ protected void recordCurrentViewAsOldViewId(@Observes @AfterPhase(PhaseId.RENDER_RESPONSE) PhaseEvent phaseEvent)
+ {
+ storeCurrentViewIdAsOldViewId(FacesContext.getCurrentInstance());
+ }
+
private boolean isPartialOrGetRequest(RequestTypeResolver requestTypeResolver)
{
return requestTypeResolver.isPartialRequest() || !requestTypeResolver.isPostRequest();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/InterceptedResponseWriter.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/scope/conversation/InterceptedResponseWriter.java?rev=978794&r1=978793&r2=978794&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/InterceptedResponseWriter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/InterceptedResponseWriter.java Sat Jul 24 04:16:23 2010
@@ -20,12 +20,9 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils
.addWindowContextIdHolderComponent;
-import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils
- .storeCurrentViewIdAsOldViewId;
import javax.faces.context.ResponseWriter;
import javax.faces.context.ResponseWriterWrapper;
-import javax.faces.context.FacesContext;
import java.io.IOException;
/**
@@ -53,15 +50,6 @@ class InterceptedResponseWriter extends
wrapped.startDocument();
}
- @Override
- public void endDocument()
- throws IOException
- {
- storeCurrentViewIdAsOldViewId(FacesContext.getCurrentInstance());
-
- wrapped.endDocument();
- }
-
protected ResponseWriter getWrapped()
{
return this.wrapped;