svn commit: r927031 - in /tomcat/trunk/java/org/apache/catalina: ha/session/DeltaManager.java session/ManagerBase.java

[markt]

Author: markt
Date: Wed Mar 24 12:26:11 2010
New Revision: 927031

URL: http://svn.apache.org/viewvc?rev=927031&view=rev
Log:
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48790 in 
preparation for a simpler solution

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=927031&r1=927030&r2=927031&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Mar 
24 12:26:11 2010
@@ -1160,7 +1160,7 @@ public class DeltaManager extends Cluste
         rejectedSessions = 0 ;
         sessionReplaceCounter = 0 ;
         counterNoStateTransfered = 0 ;
-        setMaxActive(getActiveSessions());
+        maxActive = getActiveSessions() ;
         sessionCounter = getActiveSessions() ;
         counterReceive_EVT_ALL_SESSION_DATA = 0;
         counterReceive_EVT_GET_ALL_SESSIONS = 0;

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=927031&r1=927030&r2=927031&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Mar 24 
12:26:11 2010
@@ -37,8 +37,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.management.MBeanRegistration;
 import javax.management.MBeanServer;
@@ -186,7 +184,6 @@ public abstract class ManagerBase extend
     protected int sessionCounter=0;
 
     protected int maxActive=0;
-    private final ReadWriteLock maxActiveLock = new ReentrantReadWriteLock();
 
     // number of duplicated session ids - anything >0 means we have problems
     protected int duplicates=0;
@@ -767,17 +764,8 @@ public abstract class ManagerBase extend
 
         sessions.put(session.getIdInternal(), session);
         int size = sessions.size();
-        
-        maxActiveLock.readLock().lock();
-        if (size > maxActive) {
-            maxActiveLock.readLock().unlock();
-            maxActiveLock.writeLock().lock();
-            if (size > maxActive) {
-                maxActive = size;
-            }
-            maxActiveLock.writeLock().unlock();
-        } else {
-            maxActiveLock.readLock().unlock();
+        if( size > maxActive ) {
+            maxActive = size;
         }
     }
 
@@ -1088,17 +1076,12 @@ public abstract class ManagerBase extend
      * @return The highest number of concurrent active sessions
      */
     public int getMaxActive() {
-        maxActiveLock.readLock().lock();
-        int result = maxActive;
-        maxActiveLock.readLock().unlock();
-        return result;
+        return maxActive;
     }
 
 
     public void setMaxActive(int maxActive) {
-        maxActiveLock.writeLock().lock();
         this.maxActive = maxActive;
-        maxActiveLock.writeLock().unlock();
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org