Author: nickarls Date: 2009-03-06 08:21:05 -0500 (Fri, 06 Mar 2009) New Revision: 1791 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java Log: minor. move conversation context activation in phase listener Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-03-06 12:55:02 UTC (rev 1790) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-03-06 13:21:05 UTC (rev 1791) @@ -122,7 +122,7 @@ // 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); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-03-06 12:55:02 UTC (rev 1790) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-03-06 13:21:05 UTC (rev 1791) @@ -53,10 +53,6 @@ { beforeRenderReponse(); } - else if (phaseEvent.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES)) - { - beforeApplyRequestValues(); - } } /** @@ -77,15 +73,6 @@ } /** - * 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 * * @param phaseEvent The phase event @@ -113,6 +100,7 @@ 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); } /**