ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [01/10] ignite git commit: IGNITE-2693: Fix withKeepBinary() to only return new cache if binary marshaller is used
Date Tue, 24 May 2016 11:13:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2693 [created] 7fd543c34


IGNITE-2693: Fix withKeepBinary() to only return new cache if binary marshaller is used


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

Branch: refs/heads/ignite-2693
Commit: cfd924ba0ee18debefe9b70475b09c94b0eae087
Parents: eb5bce2
Author: Oddo Da <oddodaoddo@gmail.com>
Authored: Mon Feb 29 21:00:39 2016 -0600
Committer: Oddo Da <oddodaoddo@gmail.com>
Committed: Mon Feb 29 21:00:39 2016 -0600

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/IgniteCacheProxy.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cfd924ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 5ed8753..75ec05f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.AsyncSupportAdapter;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.query.CacheQuery;
 import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
@@ -324,7 +325,10 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
 
     /** {@inheritDoc} */
     @Override public <K1, V1> IgniteCache<K1, V1> withKeepBinary() {
-        return keepBinary();
+        if (ctx.kernalContext().config().getMarshaller() instanceof BinaryMarshaller)
+            return keepBinary();
+        else
+            return (IgniteCache)this;
     }
 
     /** {@inheritDoc} */


Mime
View raw message