commit a0d90e1669dd8e412b6f6f4359e1bdb28fe09d83
author Romain Manni-Bucau <rmannibucau@gmail.com> Mon Nov 19 11:35:31 2018 +0100
committer Romain Manni-Bucau <rmannibucau@gmail.com> Mon Nov 19 11:35:31 2018 +0100
tree e0eb36bccd56dc1832029b0c93b76f861f2aff2b
parent 78d86c7ad79eee6ee600b1fd4ba900c1ab78e5f9

merge

winegrower-extension/winegrower-agent/src/main/java/org/apache/winegrower/extension/agent/WinegrowerAgent.java

diff --git a/winegrower-extension/winegrower-agent/src/main/java/org/apache/winegrower/extension/agent/WinegrowerAgent.java b/winegrower-extension/winegrower-agent/src/main/java/org/apache/winegrower/extension/agent/WinegrowerAgent.java
index 6409145..b06fb28 100644
--- a/winegrower-extension/winegrower-agent/src/main/java/org/apache/winegrower/extension/agent/WinegrowerAgent.java
+++ b/winegrower-extension/winegrower-agent/src/main/java/org/apache/winegrower/extension/agent/WinegrowerAgent.java
@@ -70,10 +70,15 @@
             .orElseGet(Collections::emptyList);
 
         final URLClassLoader loader = new WinegrowerAgentClassLoader(isolatedLibs);
+        final Thread thread = Thread.currentThread();
+        final ClassLoader contextualLoader = thread.getContextClassLoader();
+        thread.setContextClassLoader(loader);
         try {
             doStart(agentArgs, instrumentation);
         } catch (final Throwable e) {
             throw new IllegalStateException(e);
+        } finally {
+            thread.setContextClassLoader(contextualLoader);
         }
     }