ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject ignite git commit: 8446
Date Fri, 01 Jun 2018 08:45:39 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-8446 5a5e618ae -> fa5c130a5


8446


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

Branch: refs/heads/ignite-8446
Commit: fa5c130a5a48ea4a1bfa77e3b399661af4a3f607
Parents: 5a5e618
Author: Anton Vinogradov <av@apache.org>
Authored: Fri Jun 1 11:35:44 2018 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Fri Jun 1 11:35:44 2018 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxAdapter.java         | 6 +++---
 .../org/apache/ignite/testsuites/IgniteCacheTestSuite6.java    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa5c130a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 93c941f..8422bb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1185,10 +1185,10 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter
implement
      * @param type Event type.
      */
     protected void recordStateChangedEvent(int type){
-        GridEventStorageManager evt = cctx.gridEvents();
+        GridEventStorageManager evtMgr = cctx.gridEvents();
 
-        if (!system() /* ignoring system tx */ && evt.isRecordable(type))
-            evt.record(new TransactionStateChangedEvent(cctx.discovery().localNode(), null,
type, proxy()));
+        if (!system() /* ignoring system tx */ && evtMgr.isRecordable(type))
+            evtMgr.record(new TransactionStateChangedEvent(cctx.discovery().localNode(),
null, type, proxy()));
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa5c130a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
index 0612b49..166fec6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
@@ -54,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncN
 import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncTest;
 import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTopologyChangeTest;
 import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnIncorrectParamsTest;
+import org.apache.ignite.internal.processors.cache.transactions.TxStateChangeEventTest;
 
 /**
  * Test suite.
@@ -88,6 +89,7 @@ public class IgniteCacheTestSuite6 extends TestSuite {
 
         suite.addTestSuite(TxLabelTest.class);
         suite.addTestSuite(TxRollbackOnIncorrectParamsTest.class);
+        suite.addTestSuite(TxStateChangeEventTest.class);
 
         suite.addTestSuite(TxMultiCacheAsyncOpsTest.class);
 


Mime
View raw message