[jboss-cvs] JBossAS SVN: r109766 - trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test.

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

Author: pferraro
Date: 2010-12-07 16:15:39 -0500 (Tue, 07 Dec 2010)
New Revision: 109766

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java
Log:
JBAS-8706 Fix cookie copy for ipv6.

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java	2010-12-07 20:36:00 UTC (rev 109765)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java	2010-12-07 21:15:39 UTC (rev 109766)
@@ -174,12 +174,28 @@
          System.out.println(c.getDomain() + "\t" + c.getName() + "\t" + c.getPath() + "\t" + c.getValue());
       }
       
+      String server0 = this.getServers()[0];
+      String server1 = this.getServers()[1];
+      
       // Copy cookies from server[0] to server[1]
       for (Cookie c: this.client.getState().getCookies())
       {
-         if (c.getDomain().equals(this.getServers()[0]) && c.getName().equals("JSESSIONID"))
+         String domain = c.getDomain();
+         if (InetAddress.getByName(domain).equals(InetAddress.getByName(server0)) && c.getName().equals("JSESSIONID"))
          {
-            this.client.getState().addCookie(new Cookie(this.getServers()[1], c.getName(), c.getValue(), c.getPath(), c.getExpiryDate(), c.getSecure()));
+            // TODO Replace this with JBossTestUtil.fixHostnameForURL(), when ready
+            boolean wrap = domain.startsWith("[") && !server1.startsWith("[");
+            StringBuilder builder = new StringBuilder();
+            if (wrap)
+            {
+               builder.append('[');
+            }
+            builder.append(server1);
+            if (wrap)
+            {
+               builder.append(']');
+            }
+            this.client.getState().addCookie(new Cookie(builder.toString(), c.getName(), c.getValue(), c.getPath(), c.getExpiryDate(), c.getSecure()));
          }
       }
 
@@ -229,6 +245,7 @@
          this.sleep = sleep;
       }
       
+      @Override
       public Integer call() throws Exception
       {
          GetMethod method = new GetMethod(String.format(URL, CleanShutdownTestCase.this.getHttpURLs()[this.server], this.sleep));