commit bef6415e051f11dcf0054bf85efae6c9db65dc41
author Radu Cotescu <radu@apache.org> Thu Apr 09 18:04:53 2020 +0200
committer Radu Cotescu <radu@apache.org> Thu Apr 09 18:07:51 2020 +0200
tree 48c4ef3535c443c5e015b36700d2c3344d23acf9
parent 70542e31d3716796b71ff16d4014280b04d969d9

SLING-9350 - Recompile scripts which hold a stale ScriptEngine reference

src/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java

diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
index c541e59..bd274b3 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
@@ -76,10 +76,11 @@
     @Override
     public void eval(@NotNull ScriptEngine scriptEngine, @NotNull ScriptContext context) throws ScriptException {
         try {
-            if (scriptEngine instanceof Compilable && compiledScript == null) {
+            if (scriptEngine instanceof Compilable &&
+                    (compiledScript == null || !scriptEngine.getFactory().equals(compiledScript.getEngine().getFactory()))) {
                 compilationLock.lock();
                 try {
-                    if (compiledScript == null) {
+                    if (compiledScript == null || !scriptEngine.getFactory().equals(compiledScript.getEngine().getFactory())) {
                         compiledScript =
                                 ((Compilable) scriptEngine)
                                         .compile(new ScriptNameAwareReader(new StringReader(getSourceCode()), getName()));