ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [38/50] incubator-ignite git commit: # IGNITE-700: Done.
Date Wed, 08 Apr 2015 15:27:32 GMT
# IGNITE-700: Done.


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

Branch: refs/heads/ignite-30
Commit: 21c8e893e2170ae7ab11761676ddb4f2dce912f9
Parents: 080376a
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Apr 8 12:59:17 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Apr 8 12:59:17 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxManager.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21c8e893/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 12f57b4..13db6c9 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
@@ -1263,7 +1263,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
 
             // 15. Update metrics.
             if (!tx.dht() && tx.local()) {
-                cctx.txMetrics().onTxCommit();
+                if (!tx.system())
+                    cctx.txMetrics().onTxCommit();
 
                 for (int cacheId : tx.activeCacheIds()) {
                     GridCacheContext cacheCtx = cctx.cacheContext(cacheId);
@@ -1337,7 +1338,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
 
             // 11. Update metrics.
             if (!tx.dht() && tx.local()) {
-                cctx.txMetrics().onTxRollback();
+                if (!tx.system())
+                    cctx.txMetrics().onTxRollback();
 
                 for (int cacheId : tx.activeCacheIds()) {
                     GridCacheContext cacheCtx = cctx.cacheContext(cacheId);


Mime
View raw message