ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [13/48] incubator-ignite git commit: # ignite-297
Date Thu, 19 Feb 2015 18:43:35 GMT
# ignite-297


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

Branch: refs/heads/ignite-292
Commit: b1531c029f92b724a04e4bae0f6a4b7dffac4a09
Parents: f303a4f
Author: sboikov <semen.boikov@inria.fr>
Authored: Wed Feb 18 19:56:22 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Wed Feb 18 19:56:22 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheUtils.java       | 1 -
 .../processors/cache/transactions/IgniteTxManager.java         | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1531c02/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index cc3a853..f5c2836 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -54,7 +54,6 @@ import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
 import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
-import static org.apache.ignite.transactions.TransactionState.*;
 
 /**
  * Cache utility methods.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1531c02/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index f7a842a..cf32dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -655,14 +655,12 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K,
V> {
     @Nullable public IgniteInternalTx userTx() {
         IgniteInternalTx<K, V> tx = txContext();
 
-        if (tx != null && tx.user() && (tx.state() != UNKNOWN &&
tx.state() != ROLLED_BACK && tx.state() != COMMITTED))
+        if (tx != null && tx.user() && tx.state() == ACTIVE)
             return tx;
 
         tx = tx(Thread.currentThread().getId());
 
-        return tx != null &&
-            tx.user() &&
-            (tx.state() != UNKNOWN && tx.state() != ROLLED_BACK && tx.state()
!= COMMITTED) ? tx : null;
+        return tx != null && tx.user() && tx.state() == ACTIVE ? tx : null;
     }
 
     /**


Mime
View raw message