[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/08 00:31:50

  Modified:    wsrp/src/main/org/jboss/portal/wsrp/consumer 
                        SessionHandler.java
  Log:
  - Fixed issue with Handler not being available for tests. For some reason, it needs to be added on all the service definitions. I suspect it has to do with the way we change the service URL in the service factory.
  - Minor improvements.
  
  Revision  Changes    Path
  1.4       +8 -4      jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SessionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SessionHandler.java	1 Jul 2006 05:21:03 -0000	1.3
  +++ SessionHandler.java	8 Aug 2006 04:31:50 -0000	1.4
  @@ -44,7 +44,7 @@
    * Manages session informations on behalf of a consumer.
    *
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @since 2.4 (May 31, 2006)
    */
   public class SessionHandler
  @@ -86,16 +86,21 @@
      public void initPortletGroupIdIfNeeded(PortletInvocation invocation)
      {
         // if we need cookies, set the current group id
  -      if (requiresInitCookie())
  +      if (requiresGroupInitCookie())
         {
            WSRPPortletInfo info = consumer.getPortletInfo(WSRPConsumerImpl.getPortletHandle(invocation));
            RequestHeaderClientHandler.setCurrentGroupId(info.getGroupId());
         }
      }
   
  +   private boolean requiresGroupInitCookie()
  +   {
  +      return requiresInitCookie() && CookieProtocol.perGroup.equals(requiresInitCookie);
  +   }
  +
      public void resetPortletGroupIdIfNeeded()
      {
  -      if (requiresInitCookie())
  +      if (requiresGroupInitCookie())
         {
            RequestHeaderClientHandler.setCurrentGroupId(null);
         }
  @@ -130,7 +135,6 @@
            return;
         }
   
  -
         InitCookie initCookie = WSRPTypeFactory.createInitCookie(consumer.getRegistrationContext());
   
         if (isPerUserCookieInit())