You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/04/08 11:38:52 UTC
[14/39] incubator-ignite git commit: # ignite-sprint-3 Fixed
exception handling in Visor tasks.
# 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-692
Commit: 404da5f2368f48f9c99c467c98a2af53481962bd
Parents: 238cbb1
Author: Andrey Novikov <an...@gridgain.com>
Authored: Tue Apr 7 17:08:19 2015 +0700
Committer: Andrey Novikov <an...@gridgain.com>
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<VisorLogSearchTask.Vi
URL url = U.resolveIgniteUrl(arg.folder);
if (url == null)
- throw U.convertException(new GridInternalException(new FileNotFoundException("Log folder not found: " + arg.folder)));
+ throw new IgniteException(new FileNotFoundException("Log folder not found: " + arg.folder));
UUID uuid = ignite.localNode().id();
String nid = uuid.toString().toLowerCase();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/404da5f2/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index d922ad1..3f13d5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.visor.query;
import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
@@ -77,7 +76,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
VisorQueryTask.VisorFutureResultSetHolder<List<?>> 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<Object[]>, List<?>> nextRows = VisorQueryUtils.fetchSqlQueryRows(t.future(), t.next(), arg.get2());
@@ -101,7 +100,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>> 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<List<Object[]>, Map.Entry<Object, Object>> rows =
VisorQueryUtils.fetchScanQueryRows(t.future(), t.next(), arg.get2());