Clear context in a finally block

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Jul 10, 2024 · eec8b96 · eec8b96
1 parent aaba063
commit eec8b96
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/rest/RestHandlerProxy.java b/server/src/main/java/org/opensearch/rest/RestHandlerProxy.java
@@ -45,11 +45,12 @@ public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
         try {
             threadPool.getThreadContext().setExecutionContext(plugin.getClass().getName());
             result = m.invoke(restHandler, args);
-            threadPool.getThreadContext().clearExecutionContext();
         } catch (InvocationTargetException e) {
             throw e.getTargetException();
         } catch (Exception e) {
             throw new RuntimeException("unexpected invocation exception: " + e.getMessage());
+        } finally {
+            threadPool.getThreadContext().clearExecutionContext();
         }
         return result;
     }