ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [47/50] ignite git commit: Revert BinaryObjectImpl
Date Wed, 13 Apr 2016 14:53:46 GMT
Revert BinaryObjectImpl


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

Branch: refs/heads/ignite-2977
Commit: f44198d9f6a989d072ed9b4b26812b5a3b032737
Parents: 8fc3e6e
Author: Pavel Tupitsyn <ptupitsyn@gridgain.com>
Authored: Wed Apr 13 15:45:35 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@gridgain.com>
Committed: Wed Apr 13 15:45:35 2016 +0300

----------------------------------------------------------------------
 .../platform/cache/query/PlatformContinuousQueryImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f44198d9/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 e2b9f1e..db77d0e 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
@@ -27,11 +27,11 @@ import javax.cache.event.CacheEntryEvent;
 import javax.cache.event.CacheEntryEventFilter;
 import javax.cache.event.CacheEntryListenerException;
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.cache.query.ContinuousQuery;
 import org.apache.ignite.cache.query.Query;
 import org.apache.ignite.cache.query.QueryCursor;
 import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.binary.BinaryObjectImpl;
 import org.apache.ignite.internal.binary.GridBinaryMarshaller;
 import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
 import org.apache.ignite.internal.processors.cache.query.QueryCursorEx;
@@ -99,10 +99,10 @@ public class PlatformContinuousQueryImpl implements PlatformContinuousQuery
{
      * @return Java filter or null.
      */
     private static CacheEntryEventFilter getJavaFilter(Object filter, GridKernalContext ctx)
{
-        if (filter instanceof BinaryObject) {
-            BinaryObject bo = (BinaryObject)filter;
+        if (filter instanceof BinaryObjectImpl) {
+            BinaryObjectImpl bo = (BinaryObjectImpl)filter;
 
-            if (bo.type() != null && bo.type().typeId() == GridBinaryMarshaller.PLATFORM_JAVA_OBJECT_FACTORY_PROXY)
{
+            if (bo.typeId() == GridBinaryMarshaller.PLATFORM_JAVA_OBJECT_FACTORY_PROXY) {
                 PlatformJavaObjectFactoryProxy prx = bo.deserialize();
 
                 return (CacheEntryEventFilter)prx.factory(ctx).create();


Mime
View raw message