Merge with 1.8.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df2504c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df2504c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df2504c8 Branch: refs/heads/ignite-2893 Commit: df2504c8551a00ecc95973eff588cc2cbb6ce725 Parents: e9bc038 Author: dkarachentsev <dkarachent...@gridgain.com> Authored: Mon Apr 3 11:26:14 2017 +0300 Committer: dkarachentsev <dkarachent...@gridgain.com> Committed: Mon Apr 3 11:26:14 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/communication/GridIoPolicy.java | 2 +- .../org/apache/ignite/internal/processors/query/QueryUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df2504c8/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java index 0fca817..e848633 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java @@ -53,7 +53,7 @@ public class GridIoPolicy { public static final byte QUERY_POOL = 10; /** Pool for service proxy executions. */ - public static final byte SERVICE_POOL = 9; + public static final byte SERVICE_POOL = 11; /** * Defines the range of reserved pools that are not available for plugins. http://git-wip-us.apache.org/repos/asf/ignite/blob/df2504c8/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java index 20570ab..19a752a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java @@ -875,7 +875,7 @@ public class QueryUtils { * @return {@code True} if will be deserialized. */ private static boolean mustDeserializeBinary(GridKernalContext ctx, Class cls) { - if (cls != null && ctx.config().getMarshaller() instanceof BinaryMarshaller) { + if (cls != null && cls != Object.class && ctx.config().getMarshaller() instanceof BinaryMarshaller) { CacheObjectBinaryProcessorImpl proc0 = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects(); return proc0.binaryContext().mustDeserialize(cls);
