In releaseLock wait for result to be sure the lock is removed in memc…

…ached.
magro · Jun 18, 2012 · 2d9eb93 · 2d9eb93
1 parent 564ad89
commit 2d9eb93
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
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 );
         }
     }