In releaseLock wait for result to be sure the lock is removed in memcached.

Martin Grotzke · Martin Grotzke · commit 2d9eb930cf6f · 2012-06-18T11:36:19.000+02:00
diff --git a/core/src/main/java/de/javakaffee/web/msm/BackupSessionService.java b/core/src/main/java/de/javakaffee/web/msm/BackupSessionService.java
@@ -240,11 +240,11 @@ private void releaseLock( @Nonnull final MemcachedBackupSession session ) {
                     _log.debug( "Releasing lock for session " + session.getIdInternal() );
                 }
                 final long start = System.currentTimeMillis();
-                _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( session.getIdInternal() ) );
+                _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( session.getIdInternal() ) ).get();
                 _statistics.registerSince( RELEASE_LOCK, start );
                 session.releaseLock();
             } catch( final Exception e ) {
-                _log.warn( "Caught exception when trying to release lock for session " + session.getIdInternal() );
+                _log.warn( "Caught exception when trying to release lock for session " + session.getIdInternal(), e );
             }
         }
     }
diff --git a/core/src/main/java/de/javakaffee/web/msm/BackupSessionTask.java b/core/src/main/java/de/javakaffee/web/msm/BackupSessionTask.java
@@ -161,11 +161,11 @@ private void releaseLock() {
                     _log.debug( "Releasing lock for session " + _session.getIdInternal() );
                 }
                 final long start = System.currentTimeMillis();
-                _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( _session.getIdInternal() ) );
+                _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( _session.getIdInternal() ) ).get();
                 _statistics.registerSince( RELEASE_LOCK, start );
                 _session.releaseLock();
             } catch( final Exception e ) {
-                _log.warn( "Caught exception when trying to release lock for session " + _session.getIdInternal() );
+                _log.warn( "Caught exception when trying to release lock for session " + _session.getIdInternal(), e );
             }
         }
     }
diff --git a/core/src/main/java/de/javakaffee/web/msm/LockingStrategy.java b/core/src/main/java/de/javakaffee/web/msm/LockingStrategy.java
@@ -194,10 +194,10 @@ protected void releaseLock( @Nonnull final String sessionId ) {
                 _log.debug( "Releasing lock for session " + sessionId );
             }
             final long start = System.currentTimeMillis();
-            _memcached.delete( _sessionIdFormat.createLockName( sessionId ) );
+            _memcached.delete( _sessionIdFormat.createLockName( sessionId ) ).get();
             _stats.registerSince( RELEASE_LOCK, start );
         } catch ( final Exception e ) {
-            _log.warn( "Caught exception when trying to release lock for session " + sessionId );
+            _log.warn( "Caught exception when trying to release lock for session " + sessionId, e );
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,11 @@ private void releaseLock( @Nonnull final MemcachedBackupSession session ) {`
`240`	`240`	`_log.debug( "Releasing lock for session " + session.getIdInternal() );`
`241`	`241`	`}`
`242`	`242`	`final long start = System.currentTimeMillis();`
`243`		`- _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( session.getIdInternal() ) );`
	`243`	`+ _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( session.getIdInternal() ) ).get();`
`244`	`244`	`_statistics.registerSince( RELEASE_LOCK, start );`
`245`	`245`	`session.releaseLock();`
`246`	`246`	`} catch( final Exception e ) {`
`247`		`- _log.warn( "Caught exception when trying to release lock for session " + session.getIdInternal() );`
	`247`	`+ _log.warn( "Caught exception when trying to release lock for session " + session.getIdInternal(), e );`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,11 +161,11 @@ private void releaseLock() {`
`161`	`161`	`_log.debug( "Releasing lock for session " + _session.getIdInternal() );`
`162`	`162`	`}`
`163`	`163`	`final long start = System.currentTimeMillis();`
`164`		`- _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( _session.getIdInternal() ) );`
	`164`	`+ _memcached.delete( _memcachedNodesManager.getSessionIdFormat().createLockName( _session.getIdInternal() ) ).get();`
`165`	`165`	`_statistics.registerSince( RELEASE_LOCK, start );`
`166`	`166`	`_session.releaseLock();`
`167`	`167`	`} catch( final Exception e ) {`
`168`		`- _log.warn( "Caught exception when trying to release lock for session " + _session.getIdInternal() );`
	`168`	`+ _log.warn( "Caught exception when trying to release lock for session " + _session.getIdInternal(), e );`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,10 @@ protected void releaseLock( @Nonnull final String sessionId ) {`
`194`	`194`	`_log.debug( "Releasing lock for session " + sessionId );`
`195`	`195`	`}`
`196`	`196`	`final long start = System.currentTimeMillis();`
`197`		`- _memcached.delete( _sessionIdFormat.createLockName( sessionId ) );`
	`197`	`+ _memcached.delete( _sessionIdFormat.createLockName( sessionId ) ).get();`
`198`	`198`	`_stats.registerSince( RELEASE_LOCK, start );`
`199`	`199`	`} catch ( final Exception e ) {`
`200`		`- _log.warn( "Caught exception when trying to release lock for session " + sessionId );`
	`200`	`+ _log.warn( "Caught exception when trying to release lock for session " + sessionId, e );`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`