From 9e7fba9a7bfd3ca2ad8057bf1f367e4642e7b5d4 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Wed, 15 Oct 2014 11:36:40 +0200
Subject: [PATCH] Log exception thrown in ScriptEngineService.scriptRemoved

Guava would swallow the exception and log it itself if we bubbled it up,
so we catch and log it ourselves to use our logging infrastructure.
---
 .../java/org/elasticsearch/script/ScriptService.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java
index 306f7298156..06736d2b345 100644
--- a/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -27,7 +27,6 @@ import com.google.common.cache.RemovalNotification;
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.ElasticsearchIllegalStateException;
-import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
@@ -67,15 +66,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
  *
  */
@@ -502,15 +498,15 @@ public class ScriptService extends AbstractComponent {
             if (logger.isDebugEnabled()) {
                 logger.debug("notifying script services of script removal due to: [{}]", notification.getCause());
             }
-            List<Exception> errors = newArrayList();
             for (ScriptEngineService service : scriptEngines.values()) {
                 try {
                     service.scriptRemoved(notification.getValue());
                 } catch (Exception e) {
-                    errors.add(e);
+                    logger.warn("exception calling script removal listener for script service", e);
+                    // We don't rethrow because Guava would just catch the
+                    // exception and log it, which we have already done
                 }
             }
-            ExceptionsHelper.maybeThrowRuntimeAndSuppress(errors);
         }
     }