# ignite-773: all except core
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a84de45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a84de45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a84de45 Branch: refs/heads/ignite-774 Commit: 5a84de455aeb3ff7ace278af8bfd4e2550a16a71 Parents: 803881d Author: Artem Shutak <[email protected]> Authored: Tue Apr 21 19:00:02 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Tue Apr 21 19:00:02 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/twostep/GridMapQueryExecutor.java | 3 +++ .../rest/protocols/http/jetty/GridJettyRestHandler.java | 3 +++ .../java/org/apache/ignite/schema/ui/SchemaImportApp.java | 8 ++++---- .../spi/deployment/uri/GridUriDeploymentClassLoader.java | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a84de45/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index 08ad38d..2bef971 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -244,6 +244,9 @@ public class GridMapQueryExecutor implements GridMessageListener { U.error(log, "Failed to execute local query: " + req, e); sendError(node, req.requestId(), e); + + if (e instanceof Error) + throw (Error)e; } finally { h2.setFilters(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a84de45/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index 9c60c61..fac9818 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -272,6 +272,9 @@ public class GridJettyRestHandler extends AbstractHandler { U.error(log, "Failed to process HTTP request [action=" + act + ", req=" + req + ']', e); cmdRes = new GridRestResponse(STATUS_FAILED, e.getMessage()); + + if (e instanceof Error) + throw (Error)e; } JsonConfig cfg = new GridJettyJsonConfig(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a84de45/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java index 5ab5a81..00d1bc8 100644 --- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java +++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java @@ -679,7 +679,7 @@ public class SchemaImportApp extends Application { drivers.put(jdbcDrvCls, drv); } - catch (Throwable e) { + catch (Exception e) { throw new IllegalStateException(e); } } @@ -737,7 +737,7 @@ public class SchemaImportApp extends Application { if (jarFolder.exists()) fc.setInitialDirectory(jarFolder); } - catch (Throwable ignored) { + catch (Exception ignored) { // No-op. } @@ -942,7 +942,7 @@ public class SchemaImportApp extends Application { if (outFolder.exists()) dc.setInitialDirectory(outFolder); } - catch (Throwable ignored) { + catch (Exception ignored) { // No-op. } @@ -1548,7 +1548,7 @@ public class SchemaImportApp extends Application { appCls.getDeclaredMethod("setDockIconImage", java.awt.Image.class) .invoke(osxApp, fromFXImage(image("ignite", 128), null)); } - catch (Throwable ignore) { + catch (Exception ignore) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a84de45/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoader.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoader.java index e15215c..3d57cf6 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoader.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoader.java @@ -65,7 +65,7 @@ class GridUriDeploymentClassLoader extends URLClassLoader { } // Catch Throwable to secure against any errors resulted from // corrupted class definitions or other user errors. - catch (Throwable e) { + catch (Exception e) { throw new ClassNotFoundException("Failed to load class due to unexpected error: " + name, e); } } @@ -96,7 +96,7 @@ class GridUriDeploymentClassLoader extends URLClassLoader { } // Catch Throwable to secure against any errors resulted from // corrupted class definitions or other user errors. - catch (Throwable e) { + catch (Exception e) { throw new ClassNotFoundException("Failed to load class due to unexpected error: " + name, e); } }
