Author: chris.laprun(a)jboss.com Date: 2008-08-12 14:28:56 -0400 (Tue, 12 Aug 2008) New Revision: 11692 Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java Log: - JBPORTAL-2123: requiresInitCookie should now be properly transmitted to SessionHandler thus, initCookie should be properly called. - Requires more testing! Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2008-08-12 17:38:02 UTC (rev 11691) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2008-08-12 18:28:56 UTC (rev 11692) @@ -442,7 +442,7 @@ { // reset registration data and try again producerInfo.resetRegistration(); - producerInfo.refresh(true); + refreshProducerInfo(true); } RegistrationContext getRegistrationContext() throws PortletInvokerException @@ -519,7 +519,9 @@ throw new PortletInvokerException(e); } - return producerInfo.detailedRefresh(forceRefresh); + RefreshResult refreshResult = producerInfo.detailedRefresh(forceRefresh); + sessionHandler.setRequiresInitCookie(producerInfo.getRequiresInitCookie()); + return refreshResult; } // Service implementation ******************************************************************************************* @@ -559,31 +561,36 @@ public WSRP_v1_ServiceDescription_PortType getServiceDescriptionService() throws PortletInvokerException { - producerInfo.refresh(false); + refreshProducerInfo(false); return getEndpointConfigurationInfo().getServiceDescriptionService(); } public WSRP_v1_Markup_PortType getMarkupService() throws PortletInvokerException { - producerInfo.refresh(false); + refreshProducerInfo(false); return getEndpointConfigurationInfo().getMarkupService(); } public WSRP_v1_PortletManagement_PortType getPortletManagementService() throws PortletInvokerException { - producerInfo.refresh(false); + refreshProducerInfo(false); return getEndpointConfigurationInfo().getPortletManagementService(); } public WSRP_v1_Registration_PortType getRegistrationService() throws PortletInvokerException { - producerInfo.refresh(false); + refreshProducerInfo(false); return getEndpointConfigurationInfo().getRegistrationService(); } public void refreshProducerInfo() throws PortletInvokerException { - producerInfo.refresh(true); + refreshProducerInfo(true); + } + + private void refreshProducerInfo(boolean forceRefresh) throws PortletInvokerException + { + producerInfo.refresh(forceRefresh); sessionHandler.setRequiresInitCookie(producerInfo.getRequiresInitCookie()); }