Repository: ignite Updated Branches: refs/heads/ignite-2100 4f4e1565f -> 90e3c2fa8
IGNITE-2100: Bugfix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c21ac4e6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c21ac4e6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c21ac4e6 Branch: refs/heads/ignite-2100 Commit: c21ac4e69a9a98546a356e4f6ae13fad8bef811b Parents: 4f4e156 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Dec 17 11:44:06 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Dec 17 11:44:06 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c21ac4e6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index b2a51c4..9d01302 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -395,7 +395,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @return {@code True} if will be deserialized. */ private boolean mustDeserializeBinary(Class cls) { - if (ctx.config().getMarshaller() instanceof BinaryMarshaller) { + if (cls != null && ctx.config().getMarshaller() instanceof BinaryMarshaller) { CacheObjectBinaryProcessorImpl proc0 = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects(); return proc0.binaryContext().mustDeserialize(cls);
