[jboss-svn-commits] JBoss Portal SVN: r5266 - branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-09-26 20:30:40 -0400 (Tue, 26 Sep 2006)
New Revision: 5266

Modified:
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
Log:
Fixed incorrect initialization of producer session information.

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java	2006-09-26 23:01:26 UTC (rev 5265)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java	2006-09-27 00:30:40 UTC (rev 5266)
@@ -104,6 +104,7 @@
          // prepare everything for the request
          SessionHandler sessionHandler = consumer.getSessionHandler();
          sessionHandler.initCookieIfNeeded(invocation);
+
          updateRegistrationContext(request);
          RuntimeContext runtimeContext = getRuntimeContextFrom(request);
 
@@ -119,7 +120,7 @@
          try
          {
             // if we need cookies, set the current group id
-            sessionHandler.initPortletGroupIdIfNeeded(invocation);
+            sessionHandler.initProducerSessionInformation(invocation);
 
             response = performRequest(request);
 

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java	2006-09-26 23:01:26 UTC (rev 5265)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java	2006-09-27 00:30:40 UTC (rev 5266)
@@ -83,14 +83,21 @@
       this.requiresInitCookie = requiresInitCookie;
    }
 
-   void initPortletGroupIdIfNeeded(PortletInvocation invocation)
+   void initProducerSessionInformation(PortletInvocation invocation)
    {
       // if we need cookies, set the current group id
+      String groupId = null;
       if (requiresGroupInitCookie())
       {
          WSRPPortletInfo info = consumer.getPortletInfo(invocation);
-         RequestHeaderClientHandler.setCurrentInfo(info.getGroupId(), getProducerSessionInformation(invocation, true));
+         groupId = info.getGroupId();
       }
+      else
+      {
+         groupId = null;
+      }
+
+      RequestHeaderClientHandler.setCurrentInfo(groupId, getProducerSessionInformation(invocation, true));
    }
 
    private boolean requiresGroupInitCookie()
@@ -219,7 +226,7 @@
       return getProducerSessionInformation(invocation, true);
    }
 
-   ProducerSessionInformation getProducerSessionInformation(PortletInvocation invocation, boolean create)
+   private ProducerSessionInformation getProducerSessionInformation(PortletInvocation invocation, boolean create)
    {
       HttpSession session = WSRPConsumerImpl.getHttpSession(invocation);
       return getProducerSessionInformation(session, create);
@@ -230,7 +237,7 @@
       return getProducerSessionInformation(session, false);
    }
 
-   ProducerSessionInformation getProducerSessionInformation(HttpSession session, boolean create)
+   private ProducerSessionInformation getProducerSessionInformation(HttpSession session, boolean create)
    {
       ParameterValidation.throwIllegalArgExceptionIfNull(session, "Session");
       String producerSessionKey = getProducerSessionInformationKey();