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 EEAA819DD6 for ; Thu, 28 Apr 2016 13:01:46 +0000 (UTC) Received: (qmail 74741 invoked by uid 500); 28 Apr 2016 13:01:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 74576 invoked by uid 500); 28 Apr 2016 13:01:46 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 74091 invoked by uid 99); 28 Apr 2016 13:01:46 -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, 28 Apr 2016 13:01:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D130CE0579; Thu, 28 Apr 2016 13:01:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 28 Apr 2016 13:01:52 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/35] ignite git commit: IGNITE-2397 Returned more informative message. IGNITE-2397 Returned more informative message. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03f8bf4c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03f8bf4c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03f8bf4c Branch: refs/heads/ignite-db-x-10884 Commit: 03f8bf4c87ef22fe1871c488f0c8a88d3d91f8c5 Parents: 97cf2b3 Author: Andrey Novikov Authored: Tue Apr 26 09:26:08 2016 +0700 Committer: Alexey Kuznetsov Committed: Tue Apr 26 09:26:08 2016 +0700 ---------------------------------------------------------------------- .../processors/rest/handlers/query/QueryCommandHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/03f8bf4c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java index 0c44077..67e146b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.rest.handlers.query; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -45,6 +46,7 @@ import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandle import org.apache.ignite.internal.processors.rest.request.GridRestRequest; import org.apache.ignite.internal.processors.rest.request.RestQueryRequest; import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; @@ -263,6 +265,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ + @SuppressWarnings("ThrowableResultOfMethodCallIgnored") @Override public GridRestResponse call() throws Exception { final long qryId = qryIdGen.getAndIncrement(); @@ -346,7 +349,10 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { catch (Exception e) { removeQueryCursor(qryId, qryCurs); - return new GridRestResponse(GridRestResponse.STATUS_FAILED, e.getMessage()); + SQLException sqlErr = X.cause(e, SQLException.class); + + return new GridRestResponse(GridRestResponse.STATUS_FAILED, + sqlErr != null ? sqlErr.getMessage() : e.getMessage()); } }