Attachment 718055 Details for Bug 928557 – patch

[patch] patch

seam.diff (text/plain), 2.32 KB, created by Tomas Remes on 2013-03-29 12:19:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Remes

Created: 2013-03-29 12:19:17 UTC

Size: 2.32 KB

patch

obsolete

>diff --git jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
>index b7bda1d..f899624 100644
>--- jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
>+++ jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
>@@ -111,11 +111,13 @@ public class Contexts
>             javax.faces.context.FacesContext facesContext = javax.faces.context.FacesContext.getCurrentInstance();
>             if (facesContext != null)
>             {
>+             if(!Boolean.TRUE.equals(Contexts.getEventContext().get("org.jboss.seam.jsf.SeamPhaseListener.conversationInit"))){
>                if (FacesLifecycle.getPhaseId() == RESTORE_VIEW )
>                {
>                   log.debug("Page Context will be lazilly created");
>                   FacesLifecycle.resumePage();
>                }
>+             }
>             }
>          }
>          catch (NoClassDefFoundError e)
>diff --git jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
>index 704a202..ed8af94 100644
>--- jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
>+++ jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
>@@ -119,6 +119,8 @@ public class SeamPhaseListener implements PhaseListener
>          // We resume conversation after handleTransactionsBeforePhase, 
>          // so that Conversation-scoped entityManager has a transaction to enlist
>          if (event.getPhaseId() == RESTORE_VIEW) {
>+            
>+            Contexts.getEventContext().set("org.jboss.seam.jsf.SeamPhaseListener.conversationInit", true);
>             FacesContext facesContext = event.getFacesContext();
>             Map<String, String> parameters = facesContext.getExternalContext().getRequestParameterMap();
>             ConversationPropagation.instance().restoreConversationId(parameters);
>@@ -126,6 +128,7 @@ public class SeamPhaseListener implements PhaseListener
> 
>             Contexts.getEventContext().set("org.jboss.seam.jsf.SeamPhaseListener.conversationFound", conversationFound);
>             FacesLifecycle.resumeConversation(facesContext.getExternalContext());
>+            Contexts.getEventContext().remove("org.jboss.seam.jsf.SeamPhaseListener.conversationInit");
>          }
>          
>          raiseEventsBeforePhase(event);

Actions: View | Diff

Attachments on bug 928557: 718055