# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6376728 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6376728 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6376728 Branch: refs/heads/ignite-54 Commit: b6376728d81f3ffb6e4dd07f13979b14b0cb3695 Parents: fd5e15c Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 19 14:47:43 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 19 14:47:43 2015 +0300 ---------------------------------------------------------------------- .../GridCacheContinuousQueryAdapter.java | 3 ++- .../GridCacheContinuousQueryHandler.java | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java index 6657ce7..b852932 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java @@ -303,7 +303,8 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou entryLsnr, sync, oldVal, - taskNameHash); + taskNameHash, + keepPortable); routineId = ctx.kernalContext().continuous().startRoutine(hnd, bufSize, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index 5ab83e1..d77baaa 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -82,6 +82,9 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { /** Task name hash code. */ private int taskHash; + /** */ + private boolean keepPortable; + /** * Required by {@link Externalizable}. */ @@ -112,7 +115,8 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { boolean entryLsnr, boolean sync, boolean oldVal, - int taskHash) { + int taskHash, + boolean keepPortable) { assert topic != null; assert cb != null; assert !sync || entryLsnr; @@ -127,6 +131,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { this.sync = sync; this.oldVal = oldVal; this.taskHash = taskHash; + this.keepPortable = keepPortable; } /** {@inheritDoc} */ @@ -292,7 +297,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { /** {@inheritDoc} */ @Override public void onListenerRegistered(UUID routineId, GridKernalContext ctx) { if (!entryLsnr) - manager(ctx).iterate(internal, routineId, keepPortable()); + manager(ctx).iterate(internal, routineId, keepPortable); } /** {@inheritDoc} */ @@ -425,6 +430,8 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { out.writeBoolean(oldVal); out.writeInt(taskHash); + + out.writeBoolean(keepPortable); } /** {@inheritDoc} */ @@ -456,6 +463,8 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { oldVal = in.readBoolean(); taskHash = in.readInt(); + + keepPortable = in.readBoolean(); } /** @@ -469,13 +478,6 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { } /** - * @return Keep portable flag. - */ - protected boolean keepPortable() { - return false; - } - - /** * Deployable object. */ private static class DeployableObject implements Externalizable {
