Revert "IGNITE-2979: .NET: Implemented ability to use Java filter in .NET-based continuous queries."
This reverts commit e050ac0e8ce421e8039a22d4848c3165e7a62842. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03e8134d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03e8134d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03e8134d Branch: refs/heads/ignite-testing-discovery Commit: 03e8134d8f34fd319a18f4050d49dcbe15ea03e3 Parents: 778ded6 Author: vozerov-gridgain <[email protected]> Authored: Thu Apr 14 11:44:39 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Apr 14 11:44:39 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/binary/BinaryContext.java | 1 - .../platform/cache/query/PlatformContinuousQueryImpl.java | 3 ++- .../ignite/internal/processors/platform/utils/PlatformUtils.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/03e8134d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index 0a1ed11..54cb971 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -273,7 +273,6 @@ public class BinaryContext { registerPredefinedType(GridMapEntry.class, 60); registerPredefinedType(IgniteBiTuple.class, 61); registerPredefinedType(T2.class, 62); - registerPredefinedType(PlatformJavaObjectFactoryProxy.class, GridBinaryMarshaller.PLATFORM_JAVA_OBJECT_FACTORY_PROXY); http://git-wip-us.apache.org/repos/asf/ignite/blob/03e8134d/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java index e864029..f8244a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java @@ -125,6 +125,7 @@ public class PlatformContinuousQueryImpl implements PlatformContinuousQuery { @SuppressWarnings("unchecked") @Override public void start(IgniteCacheProxy cache, boolean loc, int bufSize, long timeInterval, boolean autoUnsubscribe, Query initialQry) throws IgniteCheckedException { + lock.writeLock().lock(); try { @@ -262,7 +263,7 @@ public class PlatformContinuousQueryImpl implements PlatformContinuousQuery { * @return Filter to be deployed on remote node. * @throws ObjectStreamException If failed. */ - Object writeReplace() throws ObjectStreamException { + protected Object writeReplace() throws ObjectStreamException { if (javaFilter != null) return javaFilter; http://git-wip-us.apache.org/repos/asf/ignite/blob/03e8134d/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index 37f31ae..5f43753 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -47,6 +47,8 @@ import javax.cache.CacheException; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryListenerException; import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.security.Timestamp; import java.util.ArrayList; import java.util.Collection; import java.util.List;
