ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/51] incubator-ignite git commit: IGNITE-674 - Fixing tests.
Date Fri, 10 Apr 2015 12:10:41 GMT
IGNITE-674 - Fixing tests.


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

Branch: refs/heads/ignite-537
Commit: 650bfc790662b64fc9b5fc6e0ca5dff40dd14094
Parents: a154425
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Apr 6 10:52:56 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Apr 6 10:52:56 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtCacheEntry.java     | 5 +----
 .../processors/cache/distributed/near/GridNearLockFuture.java   | 2 +-
 .../processors/cache/transactions/IgniteTxLocalAdapter.java     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/650bfc79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index 037bb0e..c9a7af8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -431,11 +431,8 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
                 for (GridCacheMvccCandidate c : cands) {
                     IgniteInternalTx tx = cctx.tm().tx(c.version());
 
-                    if (tx != null) {
-                        assert tx.local();
-
+                    if (tx != null && tx.local())
                         txFut.addTx(tx);
-                    }
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/650bfc79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index a25d546..789fd93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -511,7 +511,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
      * @param entry Entry whose lock ownership changed.
      */
     @Override public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate
owner) {
-        if (owner != null && owner.version().equals(lockVer)) {
+        if (owner != null && owner.nearLocal() && owner.version().equals(lockVer))
{
             onDone(true);
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/650bfc79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 125e4cd..efd38a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -3280,7 +3280,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
 
                 boolean locCand = false;
 
-                if (explicitCand.nearLocal())
+                if (explicitCand.nearLocal() || explicitCand.local())
                     locCand = cctx.localNodeId().equals(explicitCand.nodeId());
                 else if (explicitCand.dhtLocal())
                     locCand = cctx.localNodeId().equals(explicitCand.otherNodeId());


Mime
View raw message