ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [09/33] ignite git commit: .NET: Fix ASP.NET session state provider test failures due to incorrect merge
Date Mon, 14 Nov 2016 09:26:21 GMT
.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/8add10e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8add10e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8add10e2

Branch: refs/heads/master
Commit: 8add10e2ac9a91b0d7e473e6f40ff14d650abf96
Parents: 6a2ecdb
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Mon Oct 31 18:26:25 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Mon Oct 31 18:34:07 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/8add10e2/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 5a6e9a2..be50e5d 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
@@ -856,9 +856,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: {
@@ -984,14 +984,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: {
@@ -1000,14 +1000,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: {


Mime
View raw message