IGNITE-45 - Plugin WIP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b54ec03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b54ec03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b54ec03 Branch: refs/heads/ignite-45 Commit: 9b54ec037fef12256d39c430452682e695dc0c45 Parents: 854617e Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Mar 23 12:46:19 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Mar 23 12:46:19 2015 -0700 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 ++++-- .../processors/cache/version/GridCacheRawVersionedEntry.java | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b54ec03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 3b489cc..7e7f5a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -577,8 +577,10 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT continue; // Notify replication manager. - if (cacheCtx.isDrEnabled()) - cacheCtx.dr().beforeExchange(topVer, exchId.isLeft()); + GridCacheContext drCacheCtx = cacheCtx.isNear() ? cacheCtx.near().dht().context() : cacheCtx; + + if (drCacheCtx.isDrEnabled()) + drCacheCtx.dr().beforeExchange(topVer, exchId.isLeft()); // Partition release future is done so we can flush the write-behind store. cacheCtx.store().forceFlush(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b54ec03/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 60a9ecd..87fe976 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@ -374,8 +374,9 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridCacheRawVersionedEntry.class, this, "keyBytesLen", - keyBytes != null ? keyBytes.length : "n/a", "valBytesLen", - valBytes != null ? valBytes.length : "n/a"); + return S.toString(GridCacheRawVersionedEntry.class, this, + "keyBytesLen", keyBytes != null ? keyBytes.length : "n/a", + "valBytesLen", valBytes != null ? valBytes.length : "n/a", + "super", super.toString()); } }
