You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/21 03:02:28 UTC
[50/50] [abbrv] ignite git commit: Merge branches 'ignite-1282' and
'ignite-1753-1282' into ignite-1753-1282
Merge branches 'ignite-1282' and 'ignite-1753-1282' into ignite-1753-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3216dd45
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3216dd45
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3216dd45
Branch: refs/heads/ignite-1753-1282
Commit: 3216dd456a79ba1bdd367bd68c457cef9eb22894
Parents: aef8c4c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Nov 21 09:01:16 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Nov 21 09:01:16 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 4 ++--
.../store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3216dd45/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index a7136dc..d4ca7ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -67,7 +67,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lifecycle.LifecycleAware;
-import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.marshaller.portable.BinaryMarshaller;
import org.apache.ignite.resources.CacheStoreSessionResource;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
@@ -695,7 +695,7 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>,
entryMappings = U.newHashMap(cacheTypes.size());
if (!cacheTypes.isEmpty()) {
- boolean binarySupported = ignite.configuration().getMarshaller() instanceof PortableMarshaller;
+ boolean binarySupported = ignite.configuration().getMarshaller() instanceof BinaryMarshaller;
for (JdbcType type : cacheTypes) {
String keyType = type.getKeyType();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3216dd45/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java
index 7dc3201..39504b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStorePortableMarshallerSelfTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.cache.store.jdbc;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.marshaller.portable.BinaryMarshaller;
/**
* Class for {@code PojoCacheStore} tests.
@@ -26,7 +26,7 @@ import org.apache.ignite.marshaller.portable.PortableMarshaller;
public class CacheJdbcPojoStorePortableMarshallerSelfTest extends CacheJdbcPojoStoreAbstractSelfTest {
/** {@inheritDoc} */
@Override protected Marshaller marshaller(){
- return new PortableMarshaller();
+ return new BinaryMarshaller();
}
/**