Author: pete.muir(a)jboss.org Date: 2009-04-18 03:33:09 -0400 (Sat, 18 Apr 2009) New Revision: 2509 Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java Log: oops Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java =================================================================== --- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java 2009-04-18 00:46:28 UTC (rev 2508) +++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java 2009-04-18 07:33:09 UTC (rev 2509) @@ -108,10 +108,10 @@ } // Now set up the conversational context if it isn't already - if (!ConversationContext.INSTANCE.isActive()) + if (!ConversationContext.instance().isActive()) { - ConversationContext.INSTANCE.setBeanStore(new ConversationBeanStore(((WebRequest) request).getHttpServletRequest().getSession(), conversation.getId())); - ConversationContext.INSTANCE.setActive(true); + ConversationContext.instance().setBeanStore(new ConversationBeanStore(((WebRequest) request).getHttpServletRequest().getSession(), conversation.getId())); + ConversationContext.instance().setActive(true); } } } \ No newline at end of file Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java =================================================================== --- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java 2009-04-18 00:46:28 UTC (rev 2508) +++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java 2009-04-18 07:33:09 UTC (rev 2509) @@ -41,6 +41,6 @@ //cleanup and deactivate the conversation context CurrentManager.rootManager().getInstanceByType(ConversationManager.class).cleanupConversation(); - ConversationContext.INSTANCE.setActive(false); + ConversationContext.instance().setActive(false); } } \ No newline at end of file