You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/30 14:44:16 UTC

[1/2] ignite git commit: Test fix

Repository: ignite
Updated Branches:
  refs/heads/master de39fbf26 -> 52600f30d


Test fix


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

Branch: refs/heads/master
Commit: 7571f211ea85854854f08b9d2cecaff9850e126d
Parents: 1282f8b
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:43:40 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:43:40 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/IgniteCrossCacheTxSelfTest.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7571f211/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
index bf9b1c6..dc0293e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -148,11 +148,11 @@ public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest {
         for (int i = 0; i < TX_CNT; i++) {
             int grid = ThreadLocalRandom8.current().nextInt(nodeCount());
 
+            IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
+            IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
+
             try (Transaction tx = grid(grid).transactions().txStart(concurrency, isolation)) {
                 try {
-                    IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
-                    IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
-
                     int size = ThreadLocalRandom8.current().nextInt(24) + 1;
 
                     for (int k = 0; k < size; k++) {


[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 52600f30dca8397f417a53611231d1ad3e66454b
Parents: 7571f21 de39fbf
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:44:07 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:44:07 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------