commit ad122c5e39a7dcb256c2f251e1f16c665ba90e15
author kevan Jahanshahi <kevan@jahia.com> Mon Nov 16 20:24:53 2020 +0100
committer GitHub <noreply@github.com> Mon Nov 16 20:24:53 2020 +0100
tree f973ef72a19bbf5b5168e43dcebe8c3ea13a41e7
parent bc208d51184805d6db804714652ef25141024cb0

UNOMI-401: correctly set ClassLoader before MVEL script execute (#215)

scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java

diff --git a/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java b/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
index f0fdd51..8777b0f 100644
--- a/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
+++ b/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
@@ -44,12 +44,13 @@
 
         final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
         try {
+            Thread.currentThread().setContextClassLoader(secureFilteringClassLoader);
+
             if (!mvelExpressions.containsKey(script)) {
 
                 if (expressionFilterFactory.getExpressionFilter("mvel").filter(script) == null) {
                     mvelExpressions.put(script, INVALID_SCRIPT_MARKER);
                 } else {
-                    Thread.currentThread().setContextClassLoader(secureFilteringClassLoader);
                     ParserConfiguration parserConfiguration = new ParserConfiguration();
                     parserConfiguration.setClassLoader(secureFilteringClassLoader);
                     ParserContext parserContext = new ParserContext(parserConfiguration);