Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
opensearch-project · Jan 17, 2023 · 61d44d3 · 61d44d3
1 parent 703dc9d
commit 61d44d3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -408,7 +408,13 @@ public String executor() {
             if (e.getCause() instanceof TimeoutException) {
                 logger.info("No response from extension to request.");
             }
-            throw RuntimeException.class.cast(e.getCause());
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else if (e.getCause() instanceof Error) {
+                throw (Error) e.getCause();
+            } else {
+                throw new RuntimeException(e.getCause());
+            }
         }
     }
 
@@ -549,7 +555,13 @@ public String executor() {
             if (e.getCause() instanceof TimeoutException) {
                 logger.info("No response from extension to request.");
             }
-            throw RuntimeException.class.cast(e.getCause());
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else if (e.getCause() instanceof Error) {
+                throw (Error) e.getCause();
+            } else {
+                throw new RuntimeException(e.getCause());
+            }
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/extensions/rest/RestSendToExtensionAction.java b/server/src/main/java/org/opensearch/extensions/rest/RestSendToExtensionAction.java
@@ -181,7 +181,13 @@ public String executor() {
                     new BytesRestResponse(RestStatus.REQUEST_TIMEOUT, "No response from extension to request.")
                 );
             }
-            throw RuntimeException.class.cast(cause);
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else if (e.getCause() instanceof Error) {
+                throw (Error) e.getCause();
+            } else {
+                throw new RuntimeException(e.getCause());
+            }
         } catch (Exception ex) {
             logger.info("Failed to send REST Actions to extension " + discoveryExtensionNode.getName(), ex);
             return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, ex.getMessage()));