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 B1E5F1746A for ; Tue, 7 Apr 2015 11:49:47 +0000 (UTC) Received: (qmail 93337 invoked by uid 500); 7 Apr 2015 11:49:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93310 invoked by uid 500); 7 Apr 2015 11:49:47 -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 93301 invoked by uid 99); 7 Apr 2015 11:49:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Apr 2015 11:49:47 +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; Tue, 07 Apr 2015 11:49:25 +0000 Received: (qmail 93228 invoked by uid 99); 7 Apr 2015 11:49:22 -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; Tue, 07 Apr 2015 11:49:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3EFC6E2F1E; Tue, 7 Apr 2015 11:42:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 07 Apr 2015 11:43:08 -0000 Message-Id: <70361ed9cb35456aad2b0c12509d442d@git.apache.org> In-Reply-To: <0998388a0a464889b9fbf101e576cae4@git.apache.org> References: <0998388a0a464889b9fbf101e576cae4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/16] incubator-ignite git commit: # ignite-sprint-3 Fixed exception handling in Visor tasks. X-Virus-Checked: Checked by ClamAV on apache.org # ignite-sprint-3 Fixed exception handling in Visor tasks. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/404da5f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/404da5f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/404da5f2 Branch: refs/heads/ignite-665 Commit: 404da5f2368f48f9c99c467c98a2af53481962bd Parents: 238cbb1 Author: Andrey Novikov Authored: Tue Apr 7 17:08:19 2015 +0700 Committer: Andrey Novikov Committed: Tue Apr 7 17:08:19 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/visor/log/VisorLogSearchTask.java | 3 +-- .../ignite/internal/visor/query/VisorQueryNextPageTask.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/404da5f2/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java index 470a739..476d58c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.log; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.util.io.*; import org.apache.ignite.internal.util.lang.*; @@ -213,7 +212,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask> t = storage.get(arg.get1()); if (t == null) - throw new GridInternalException("SQL query results are expired."); + throw new IgniteException("SQL query results are expired."); IgniteBiTuple, List> nextRows = VisorQueryUtils.fetchSqlQueryRows(t.future(), t.next(), arg.get2()); @@ -101,7 +100,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask> t = storage.get(arg.get1()); if (t == null) - throw new GridInternalException("Scan query results are expired."); + throw new IgniteException("Scan query results are expired."); IgniteBiTuple, Map.Entry> rows = VisorQueryUtils.fetchScanQueryRows(t.future(), t.next(), arg.get2());