Repository: flink
Updated Branches:
  refs/heads/release-1.6 0da30b713 -> 5d8431474


[hotfix] [sql-client] Wrap exceptions thrown during environment instance 
creation


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5d843147
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5d843147
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5d843147

Branch: refs/heads/release-1.6
Commit: 5d8431474b6e1c082fc06c83f739a85211cb1482
Parents: 0da30b7
Author: Timo Walther <[email protected]>
Authored: Mon Jul 23 13:48:45 2018 +0200
Committer: Timo Walther <[email protected]>
Committed: Mon Jul 23 13:55:01 2018 +0200

----------------------------------------------------------------------
 .../flink/table/client/gateway/local/ExecutionContext.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5d843147/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
----------------------------------------------------------------------
diff --git 
a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
 
b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
index 9152908..4283953 100644
--- 
a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
+++ 
b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
@@ -166,7 +166,12 @@ public class ExecutionContext<T> {
        }
 
        public EnvironmentInstance createEnvironmentInstance() {
-               return new EnvironmentInstance();
+               try {
+                       return new EnvironmentInstance();
+               } catch (Throwable t) {
+                       // catch everything such that a wrong environment does 
not affect invocations
+                       throw new SqlExecutionException("Could not create 
environment instance.", t);
+               }
        }
 
        public Map<String, TableSource<?>> getTableSources() {

Reply via email to