From 4ccca1fc148e9aeee22b3b1fd003abb70e5d0d15 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 7 Nov 2015 18:42:17 +0100
Subject: [PATCH] use reflection rather than getResource to locate javax.script

Using getResource won't load .class files on Jigsaw-modified versions of
Java9.

Bugzilla 58271: https://bz.apache.org/bugzilla/show_bug.cgi?id=58271
---
 WHATSNEW                                             |  3 +++
 .../apache/tools/ant/util/ScriptRunnerCreator.java   | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 385b2233f..0d06316c4 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,9 @@ Fixed bugs:
    create archives of that kind.
    https://issues.apache.org/jira/browse/COMPRESS-324
 
+ * <script> could fail to find javax.script on JDK9 with Jigsaw.
+   Bugzilla Report 58271
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
index 77e9ee737..6ce3c7e07 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
@@ -113,11 +113,17 @@ public class ScriptRunnerCreator {
         if (!manager.equals(AUTO) && !manager.equals(checkManager)) {
             return null;
         }
-        if (scriptLoader.getResource(LoaderUtils.classNameToResource(managerClass)) == null) {
-            return null;
-        }
         if (managerClass.equals(BSF_MANAGER)) {
+            if (scriptLoader.getResource(LoaderUtils.classNameToResource(managerClass)) == null) {
+                return null;
+            }
             new ScriptFixBSFPath().fixClassLoader(scriptLoader, language);
+        } else {
+            try {
+                Class.forName(managerClass, true, scriptLoader);
+            } catch (Exception ex) {
+                return null;
+            }
         }
         try {
             runner = (ScriptRunnerBase) Class.forName(