From 5dae56e2b83ad5abce59779540a9175e95ad3941 Mon Sep 17 00:00:00 2001
From: Kirill Vlasov <kirill.vlasov@devfactory.com>
Date: Thu, 10 Dec 2015 11:34:46 +0500
Subject: [PATCH] Fixing squid:S1181 - Throwable and Error should not be caught

---
 .../elasticsearch/common/util/PlainIndexableObject.java   | 2 +-
 .../jdbc/strategy/standard/StandardContext.java           | 6 +++---
 .../jdbc/strategy/standard/StandardSource.java            | 2 +-
 src/main/java/org/xbib/pipeline/AbstractPipeline.java     | 2 +-
 src/main/java/org/xbib/tools/Importer.java                | 8 ++++----
 src/main/java/org/xbib/tools/Runner.java                  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/xbib/elasticsearch/common/util/PlainIndexableObject.java b/src/main/java/org/xbib/elasticsearch/common/util/PlainIndexableObject.java
index f86ef03b..5b84be46 100644
--- a/src/main/java/org/xbib/elasticsearch/common/util/PlainIndexableObject.java
+++ b/src/main/java/org/xbib/elasticsearch/common/util/PlainIndexableObject.java
@@ -165,7 +165,7 @@ protected XContentBuilder toXContent(XContentBuilder builder, Params params, Map
             } else {
                 try {
                     builder.value(o);
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     throw new IOException("unknown object class for value:" + o.getClass().getName() + " " + o);
                 }
             }
diff --git a/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardContext.java b/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardContext.java
index 81fe63f8..cf686009 100644
--- a/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardContext.java
+++ b/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardContext.java
@@ -186,7 +186,7 @@ public void fetch() throws Exception {
         logger.debug("fetch");
         try {
             getSource().fetch();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             setThrowable(e);
             logger.error(e.getMessage(), e);
         }
@@ -198,13 +198,13 @@ public void afterFetch() throws Exception {
         writeState();
         try {
             getSource().afterFetch();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             setThrowable(e);
             logger.error(e.getMessage(), e);
         }
         try {
             getSink().afterFetch();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             setThrowable(e);
             logger.error(e.getMessage(), e);
         }
diff --git a/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardSource.java b/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardSource.java
index 7b640f57..1871f102 100644
--- a/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardSource.java
+++ b/src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardSource.java
@@ -929,7 +929,7 @@ public StandardSource<C> register(CallableStatement statement, Map<String, Objec
                     logger.debug("registerOutParameter: n={} type={}", n, toJDBCType(type));
                     try {
                         statement.registerOutParameter(n, toJDBCType(type));
-                    } catch (Throwable t) {
+                    } catch (Exception e) {
                         logger.warn("can't register out parameter " + n + " of type " + type);
                     }
                 }
diff --git a/src/main/java/org/xbib/pipeline/AbstractPipeline.java b/src/main/java/org/xbib/pipeline/AbstractPipeline.java
index 1c206072..3774ff10 100644
--- a/src/main/java/org/xbib/pipeline/AbstractPipeline.java
+++ b/src/main/java/org/xbib/pipeline/AbstractPipeline.java
@@ -53,7 +53,7 @@ public R call() throws Exception {
             close();
         } catch (InterruptedException e) {
             logger.warn("interrupted");
-        } catch (Throwable t) {
+        } catch (Exception t) {
             logger.error(t.getMessage(), t);
             throw t;
         }
diff --git a/src/main/java/org/xbib/tools/Importer.java b/src/main/java/org/xbib/tools/Importer.java
index ecc23e2d..bc9d3b24 100644
--- a/src/main/java/org/xbib/tools/Importer.java
+++ b/src/main/java/org/xbib/tools/Importer.java
@@ -146,7 +146,7 @@ public void run(boolean bootstrap) {
             } else {
                 execute();
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.error(e.getMessage(), e);
         } finally {
             try {
@@ -154,7 +154,7 @@ public void run(boolean bootstrap) {
                 if (executor != null) {
                     executor.shutdown();
                 }
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 logger.warn(e.getMessage(), e);
             }
         }
@@ -165,7 +165,7 @@ public void run() {
         try {
             prepare();
             execute();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.error(e.getMessage(), e);
         } finally {
             try {
@@ -173,7 +173,7 @@ public void run() {
                 if (executor != null) {
                     executor.shutdown();
                 }
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 logger.warn(e.getMessage(), e);
             }
         }
diff --git a/src/main/java/org/xbib/tools/Runner.java b/src/main/java/org/xbib/tools/Runner.java
index 75dd715b..4dd1a5c0 100644
--- a/src/main/java/org/xbib/tools/Runner.java
+++ b/src/main/java/org/xbib/tools/Runner.java
@@ -27,7 +27,7 @@ public static void main(String[] args) {
             InputStream in = args.length > 1 ? new FileInputStream(args[1]) : System.in;
             commandLineInterpreter.reader("args", in).run(true);
             in.close();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             e.printStackTrace();
             System.exit(1);
         }