Author: pete.muir(a)jboss.org Date: 2010-01-30 07:17:09 -0500 (Sat, 30 Jan 2010) New Revision: 5674 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java Log: CDITCK-104 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2010-01-30 12:02:21 UTC (rev 5673) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2010-01-30 12:17:09 UTC (rev 5674) @@ -65,7 +65,7 @@ BeanManager beanManager = configuration.getManagers().getManager(); Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class); HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse(); - response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId()); + response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId() == null ? " null" : conversation.getId()); response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(!conversation.isTransient())); response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(OldSPIBridge.getInstanceByType(beanManager, Cloud.class).isRained()).toString()); response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString());