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

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

Author: chris.laprun at jboss.com
Date: 2006-09-20 18:37:22 -0400 (Wed, 20 Sep 2006)
New Revision: 5233

Modified:
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/ProducerSessionInformationTestCase.java
   branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
Log:
JBPORTAL-1051: fixed and added test case.

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/ProducerSessionInformationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/ProducerSessionInformationTestCase.java	2006-09-20 21:47:38 UTC (rev 5232)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/test/wsrp/ProducerSessionInformationTestCase.java	2006-09-20 22:37:22 UTC (rev 5233)
@@ -132,6 +132,9 @@
    {
       info.setUserCookie(new Cookie[]{createCookie("name", "value", 1)});
 
+      info.replaceUserCookiesWith(null);
+      assertEquals("name=value", info.getUserCookie());
+
       ProducerSessionInformation other = new ProducerSessionInformation();
 
       info.replaceUserCookiesWith(other);

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java	2006-09-20 21:47:38 UTC (rev 5232)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java	2006-09-20 22:37:22 UTC (rev 5233)
@@ -218,7 +218,7 @@
 
    public void replaceUserCookiesWith(ProducerSessionInformation currentSessionInfo)
    {
-      if (currentSessionInfo.userCookie != null && currentSessionInfo.userCookie.length > 0)
+      if (currentSessionInfo != null && currentSessionInfo.userCookie != null && currentSessionInfo.userCookie.length > 0)
       {
          this.userCookie = currentSessionInfo.userCookie;
       }