ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a3ba538 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a3ba538 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a3ba538 Branch: refs/heads/ignite-4371 Commit: 5a3ba538b814320ec532801a79c92af786c12ad0 Parents: 55e7f9b Author: sboikov <[email protected]> Authored: Wed Dec 7 10:54:09 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 7 10:54:09 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 3 ++- .../processors/cache/distributed/IgniteCacheCreatePutTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5a3ba538/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 35e6267..519d0fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -218,7 +218,8 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Override public void onKernalStart() throws IgniteCheckedException { super.onKernalStart(); - preldr.onKernalStart(); + if (preldr != null) + preldr.onKernalStart(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/5a3ba538/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java index 2f700f3..a91de67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java @@ -107,7 +107,7 @@ public class IgniteCacheCreatePutTest extends GridCommonAbstractTest { try { int iter = 0; - while (System.currentTimeMillis() < stopTime) { + while (System.currentTimeMillis() < stopTime && iter < 5) { log.info("Iteration: " + iter++); try {
