[jboss-cvs] JBossAS SVN: r109785 - in trunk: tomcat/src/main/java/org/jboss/web/tomcat/service/session and 1 other directory.

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

Author: wolfc
Date: 2010-12-08 13:07:22 -0500 (Wed, 08 Dec 2010)
New Revision: 109785

Modified:
   trunk/component-matrix/pom.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
Rollback of 109753


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-12-08 17:51:52 UTC (rev 109784)
+++ trunk/component-matrix/pom.xml	2010-12-08 18:07:22 UTC (rev 109785)
@@ -60,7 +60,7 @@
     <version.jboss.jbossws-spi>1.4.1.CR4</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.jsf-deployer>1.0.3</version.jboss.jsf-deployer>
-    <version.jboss.web>3.0.0-beta-8</version.jboss.web>
+    <version.jboss.web>3.0.0-beta-7</version.jboss.web>
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-12-08 17:51:52 UTC (rev 109784)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-12-08 18:07:22 UTC (rev 109785)
@@ -28,7 +28,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Random;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeSet;
@@ -404,7 +403,7 @@
    }
 
 
-   public void changeSessionId(Session session, Random random)
+   public void changeSessionId(Session session)
    {
       // FIXME: Eventually support session id change 
       // FIXME: (disabled by default right now, so this should not be called for now)
@@ -456,7 +455,15 @@
    /**
     * {@inheritDoc}
     */
-   public Session createSession(String sessionId, Random random)
+   public Session createSession()
+   {
+      return createSession(null);
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Session createSession(String sessionId)
    {  
       Session session = null;
       try
@@ -1575,11 +1582,6 @@
       this.installContextValve(valve);
    }
 
-   protected boolean appendJVMRoute()
-   {
-      return false;
-   }
-
    protected void initClusteredSessionNotificationPolicy()
    {
       if (this.notificationPolicyClass_ == null || this.notificationPolicyClass_.length() == 0)