[jboss-cvs] JBossAS SVN: r108662 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn.

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

Author: pferraro
Date: 2010-10-19 12:34:39 -0400 (Tue, 19 Oct 2010)
New Revision: 108662

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
Log:
Drop hard coded lock timeout - and use lock timeout from cache config.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-10-19 16:32:35 UTC (rev 108661)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-10-19 16:34:39 UTC (rev 108662)
@@ -100,9 +100,6 @@
    private final BatchingManager batchingManager;
    private final boolean passivationEnabled;
    
-   // FIXME make configurable
-   private long lockTimeout = 30000;
-   
    public DistributedCacheManager(LocalDistributableSessionManager manager,
          Cache<String, Map<Object, Object>> sessionCache, Cache<Address, String> jvmRouteCache,
          SharedLocalYieldingClusterLockManager lockManager, SessionAttributeStorage<T> attributeStorage,
@@ -437,7 +434,7 @@
    public LockResult acquireSessionOwnership(String sessionId, boolean newLock) throws TimeoutException, InterruptedException
    {
       log.info(String.format("acquireSessionOwnership(%s, %s)", sessionId, newLock));
-      LockResult result = lockResultMap.get(this.lockManager.lock(this.getSessionLockKey(sessionId), this.lockTimeout, newLock));
+      LockResult result = lockResultMap.get(this.lockManager.lock(this.getSessionLockKey(sessionId), this.sessionCache.getAdvancedCache().getConfiguration().getLockAcquisitionTimeout(), newLock));
       
       return (result != null) ? result : LockResult.UNSUPPORTED;
    }