Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE17617B49 for ; Thu, 9 Apr 2015 14:09:56 +0000 (UTC) Received: (qmail 64158 invoked by uid 500); 9 Apr 2015 14:09:56 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 64128 invoked by uid 500); 9 Apr 2015 14:09:56 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 64119 invoked by uid 99); 9 Apr 2015 14:09:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 14:09:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Apr 2015 14:09:55 +0000 Received: (qmail 63711 invoked by uid 99); 9 Apr 2015 14:09:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 14:09:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2DD42DFF98; Thu, 9 Apr 2015 14:09:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 14:09:35 -0000 Message-Id: <43b229411257445393b6ff5dfb4ffe5d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-ignite git commit: # GG-10064: Fixed marshaller bug. X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-3 86c3bc551 -> ac779fa35 # GG-10064: Fixed marshaller bug. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c1ad007 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c1ad007 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c1ad007 Branch: refs/heads/ignite-sprint-3 Commit: 0c1ad007f3c76a0e9e356619707aa07ab212ef87 Parents: fd9cdff Author: vozerov-gridgain Authored: Thu Apr 9 17:09:19 2015 +0300 Committer: vozerov-gridgain Committed: Thu Apr 9 17:09:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/MarshallerContextImpl.java | 3 +++ .../continuous/CacheContinuousQueryManager.java | 28 -------------------- 2 files changed, 3 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c1ad007/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index e6ef192..0952e86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -131,6 +131,9 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { throw new IgniteCheckedException("Failed to read class name from file [id=" + id + ", file=" + file.getAbsolutePath() + ']', e); } + + // Must explicitly put entry to cache to invoke other continuous queries. + registerClassName(id, clsName); } return clsName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c1ad007/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index 0d28120..13d29bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -274,34 +274,6 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ - public UUID executeInternalQueryForNonInternalKeys(CacheEntryUpdatedListener locLsnr, - CacheEntryEventSerializableFilter rmtFilter, - boolean loc, - boolean notifyExisting) - throws IgniteCheckedException - { - return executeQuery0( - locLsnr, - rmtFilter, - ContinuousQuery.DFLT_PAGE_SIZE, - ContinuousQuery.DFLT_TIME_INTERVAL, - ContinuousQuery.DFLT_AUTO_UNSUBSCRIBE, - false, - notifyExisting, - true, - false, - true, - loc ? cctx.grid().cluster().forLocal() : null); - } - - /** - * @param locLsnr Local listener. - * @param rmtFilter Remote filter. - * @param loc Local flag. - * @param notifyExisting Notify existing flag. - * @return Continuous routine ID. - * @throws IgniteCheckedException In case of error. - */ public UUID executeInternalQuery(CacheEntryUpdatedListener locLsnr, CacheEntryEventSerializableFilter rmtFilter, boolean loc,