.NET: Fix ASP.NET session state provider test failures due to incorrect merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1b87036 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1b87036 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1b87036 Branch: refs/heads/master Commit: b1b87036fa180df80e07db00f3674eba6089fe71 Parents: 9ebbaea Author: Pavel Tupitsyn <[email protected]> Authored: Mon Oct 31 18:26:25 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Mon Oct 31 18:26:25 2016 +0300 ---------------------------------------------------------------------- .../processors/platform/cache/PlatformCache.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1b87036/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java index 558a9b3..c552bae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java @@ -873,9 +873,9 @@ public class PlatformCache extends PlatformAbstractTarget { long update = reader.readLong(); long access = reader.readLong(); - IgniteCache cache0 = cache.withExpiryPolicy(new InteropExpiryPolicy(create, update, access)); + IgniteCache cache0 = rawCache.withExpiryPolicy(new InteropExpiryPolicy(create, update, access)); - return new PlatformCache(platformCtx, cache0, keepBinary); + return copy(cache0, keepBinary); } case OP_LOC_ITERATOR: { @@ -1001,14 +1001,14 @@ public class PlatformCache extends PlatformAbstractTarget { if (cache.isAsync()) return this; - return new PlatformCache(platformCtx, (IgniteCache)cache.withAsync(), keepBinary); + return copy(rawCache.withAsync(), keepBinary); } case OP_WITH_KEEP_BINARY: { if (keepBinary) return this; - return new PlatformCache(platformCtx, cache.withKeepBinary(), true); + return copy(rawCache.withKeepBinary(), true); } case OP_WITH_NO_RETRIES: { @@ -1017,14 +1017,14 @@ public class PlatformCache extends PlatformAbstractTarget { if (opCtx != null && opCtx.noRetries()) return this; - return new PlatformCache(platformCtx, cache.withNoRetries(), keepBinary); + return copy(rawCache.withNoRetries(), keepBinary); } case OP_WITH_SKIP_STORE: { if (cache.delegate().skipStore()) return this; - return new PlatformCache(platformCtx, cache.withSkipStore(), keepBinary); + return copy(rawCache.withSkipStore(), keepBinary); } case OP_ITERATOR: {
