Support OpenJDK flavor of Rhino

ctrueden · ctrueden · commit 6f7d4ac755eb · 2015-11-19T16:50:25.000-06:00
Previously, our load function would fail on OpenJDK with the cryptic error:

sun.org.mozilla.javascript.EvaluatorException: Function importClass must be called with a class; had "[JavaPackage sun.org.mozilla.javascript.internal.Context]" instead.

Which was caused by the fact that the wrong fully qualified Context class name
was returned: OpenJDK uses sun.org.mozilla.javascript.Context, whereas Oracle
Java uses sun.org.mozilla.javascript.internal.Context.

This may remain a lurking issue with OpenJDK-8-flavored Nashorn... but I don't
have an OpenJDK 8 installation to use for testing at this moment. Hopefully
this commit will be enough of a hint to fix similar problems in the future.
diff --git a/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java
@@ -156,8 +156,13 @@ private String contextClass(final ScriptEngine engine) {
 
 		if (isRhino()) {
 			if (engineClassName.startsWith("com.sun.")) {
-				// assume JDK-flavored Rhino script engine
-				return "sun.org.mozilla.javascript.internal.Context";
+				if (isOpenJDK()) {
+					return "sun.org.mozilla.javascript.Context";
+				}
+				else {
+					// assume Oracle version of Java
+					return "sun.org.mozilla.javascript.internal.Context";
+				}
 			}
 			// assume vanilla Mozilla-flavored Rhino script engine
 			return "org.mozilla.javascript.Context";
