[jboss-cvs] JBossAS SVN: r83027 - in branches/Branch_5_x: tomcat/src/main/org/jboss/web/tomcat/service/session and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2009-01-18 11:28:52 -0500 (Sun, 18 Jan 2009)
New Revision: 83027

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java
Log:
[JBAS-6389] Properly handle domain included in jvmRoute

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java	2009-01-18 16:07:24 UTC (rev 83026)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java	2009-01-18 16:28:52 UTC (rev 83027)
@@ -45,6 +45,10 @@
    private static final String NON_FAILOVER_ID = "123." + JVM_ROUTE;
    private static final String FAILOVER_ID = "123.node2";
    private static final String NO_JVMROUTE_ID = "123";
+
+   private static final String DOMAIN_JVM_ROUTE = "domain1.node1";
+   private static final String DOMAIN_NON_FAILOVER_ID = "123." + DOMAIN_JVM_ROUTE;
+   private static final String DOMAIN_FAILOVER_ID = "123.domain1.node2";
    
    /**
     * Create a new JvmRouteValueUnitTestCase.
@@ -528,5 +532,34 @@
       assertEquals(NON_FAILOVER_ID, session.getId());
       assertEquals(null, mgr.getNewCookieIdSession());
    }
+   
+   public void testJvmRouteIncludesDomain() throws Exception
+   {
+      log.info("Enter testJvmRouteIncludesDomain");
+      
+      MockJBossManager mgr = new MockJBossManager();
+      mgr.setJvmRoute(DOMAIN_JVM_ROUTE);
+       
+      JvmRouteValve jvmRouteValve = new JvmRouteValve(mgr);
+      
+      MockValve mockValve = new MockValve();
+      
+      jvmRouteValve.setNext(mockValve);
+      
+      Session session = mgr.createSession(DOMAIN_FAILOVER_ID);
+      MockRequest req = new MockRequest();
+      req.setSession(session.getSession());
+      req.setRequestedSessionId(session.getId());
+      
+      Response res = new Response();
+      
+      jvmRouteValve.invoke(req, res);
+      
+      assertSame(req, mockValve.getInvokedRequest());
+      assertSame(res, mockValve.getInvokedResponse());
+      assertEquals(DOMAIN_NON_FAILOVER_ID, session.getId());
+      assertEquals(DOMAIN_NON_FAILOVER_ID, mgr.getNewCookieIdSession());
+      
+   }
 
 }

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java	2009-01-18 16:07:24 UTC (rev 83026)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/session/JvmRouteValve.java	2009-01-18 16:28:52 UTC (rev 83027)
@@ -132,7 +132,7 @@
       
       // TODO. The current format is assumed to be id.jvmRoute. Can be generalized later.
       String sessionJvmRoute = null;
-      int index = sessionId.lastIndexOf(".");
+      int index = sessionId.indexOf(".");
       if (index > 0)
       {
          sessionJvmRoute = sessionId.substring(index + 1, sessionId.length());
@@ -175,7 +175,7 @@
             String requestedJvmRoute = null;
             if (requestedId != null)
             {
-               index = requestedId.lastIndexOf(".");
+               index = requestedId.indexOf(".");
                if (index > 0)
                {
                   requestedJvmRoute = requestedId.substring(index + 1, requestedId.length());