ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject ignite git commit: IGNITE-5299 Don't set IgniteLock as broken if lock is failoverSafe
Date Tue, 30 May 2017 13:10:24 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 8237ac6f6 -> fd1d87b99


IGNITE-5299 Don't set IgniteLock as broken if lock is failoverSafe


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd1d87b9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd1d87b9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd1d87b9

Branch: refs/heads/master
Commit: fd1d87b997c02e511731fcfd0c49d1ce5d0af2e6
Parents: 8237ac6
Author: Evgenii Zhuravlev <ezhuravlev@gridgain.com>
Authored: Mon May 29 16:46:11 2017 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Tue May 30 16:10:13 2017 +0300

----------------------------------------------------------------------
 .../processors/datastructures/GridCacheLockImpl.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fd1d87b9/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
index 0192354..7bf55a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
@@ -1151,10 +1151,10 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo
 
         try {
             if (nodeId.equals(sync.getOwnerNode())) {
-                sync.setBroken(true);
-
-                if (!sync.failoverSafe)
+                if (!sync.failoverSafe) {
+                    sync.setBroken(true);
                     sync.interruptAll();
+                }
             }
 
             // Try to notify any waiting threads.
@@ -1173,7 +1173,9 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo
             return;
         }
 
-        sync.setBroken(true);
+        if (!sync.failoverSafe) {
+            sync.setBroken(true);
+        }
 
         sync.interruptAll();
 


Mime
View raw message