minor. move conversation context activation in phase listener

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1791 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 6, 2009 · ef558fc · ef558fc
1 parent a628b3c
commit ef558fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java b/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
@@ -122,7 +122,7 @@ public void beginOrRestoreConversation(String cid)
          // We got an incoming conversation ID but it was not in the map of
          // known ones, nothing to do. Log and return to continue with a
          // transient conversation
-         log.info("Could not restore long-running conversation " + cid);
+         log.warn("Could not restore long-running conversation " + cid);
          return;
       }
       ConversationEntry resumedConversationEntry = longRunningConversations.get(cid);

diff --git a/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java b/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
@@ -53,10 +53,6 @@ public void beforePhase(PhaseEvent phaseEvent)
       {
          beforeRenderReponse();
       }
-      else if (phaseEvent.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES))
-      {
-         beforeApplyRequestValues();
-      }
    }
 
    /**
@@ -76,15 +72,6 @@ private void beforeRenderReponse()
       }
    }
 
-   /**
-    * Run before request values are applied
-    */
-   private void beforeApplyRequestValues()
-   {
-      log.trace("In before apply values phase");
-      ConversationContext.INSTANCE.setActive(true);
-   }
-
    /**
     * Run after a given phase
     * 
@@ -113,6 +100,7 @@ private void afterRestoreView()
       CurrentManager.rootManager().getInstanceByType(ConversationManager.class).beginOrRestoreConversation(PhaseHelper.getConversationId());
       String cid = CurrentManager.rootManager().getInstanceByType(Conversation.class).getId();
       ConversationContext.INSTANCE.setBeanStore(new ConversationBeanStore(session, cid));
+      ConversationContext.INSTANCE.setActive(true);
    }
 
    /**