jruby · Jun 12, 2018 · Jun 12, 2018
Showing with 40 additions and 3 deletions.

+6 −1 core/src/main/java/org/jruby/RubyDir.java

+4 −2 core/src/main/java/org/jruby/embed/jsr223/JRubyEngine.java

+30 −0 core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -281,7 +281,12 @@ private static RubyArray entriesCommon(ThreadContext context, String path) {
     private static final String[] NO_FILES = StringSupport.EMPTY_STRING_ARRAY;
 
     private static String[] getEntries(ThreadContext context, FileResource dir, String path) {
-        if (!dir.isDirectory()) throw context.runtime.newErrnoENOENTError("No such directory: " + path);
+        if (!dir.isDirectory()) {
+            if (dir.exists()) {
+                throw context.runtime.newErrnoENOTDIRError(path);
+            }
+            throw context.runtime.newErrnoENOENTError(path);
+        }
         if (!dir.canRead()) throw context.runtime.newErrnoEACCESError(path);
 
         String[] list = dir.list();

diff --git a/core/src/main/java/org/jruby/embed/jsr223/JRubyEngine.java b/core/src/main/java/org/jruby/embed/jsr223/JRubyEngine.java
@@ -214,7 +214,8 @@ public Object invokeMethod(Object receiver, String method, Object... args)
             }
             return container.callMethod(receiver, method, args, Object.class);
         } catch (Exception e) {
-            if (e.getCause().getMessage().contains("undefined method")) {
+            if (e.getCause() != null && e.getCause().getMessage() != null
+                    && e.getCause().getMessage().contains("undefined method")) {
                 throw wrapMethodException(e);
             }
             throw wrapException(e);
@@ -239,7 +240,8 @@ public Object invokeFunction(String method, Object... args)
             }
             return container.callMethod(container.getProvider().getRuntime().getTopSelf(), method, args, Object.class);
         } catch (Exception e) {
-            if (e.getCause().getMessage().contains("undefined method")) {
+            if (e.getCause() != null && e.getCause().getMessage() != null
+                    && e.getCause().getMessage().contains("undefined method")) {
                 throw wrapMethodException(e);
             }
             throw wrapException(e);

diff --git a/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java b/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
@@ -616,6 +616,21 @@ public void testInvokeMethod() throws Exception {
         instance.getBindings(ScriptContext.ENGINE_SCOPE).clear();
     }
 
+    /**
+     * Test of invokeMethod method throwing an exception with a null message.
+     */
+    @Test
+    public void testInvokeMethodWithJavaException() throws Exception {
+        ScriptEngine instance = newScriptEngine();
+        instance.eval("def trigger_npe\nraise java.lang.NullPointerException.new\nend");
+        try {
+            Object result = ((Invocable) instance).invokeMethod(Object.class,"trigger_npe", null);
+            fail("Expected javax.script.ScriptException");
+        } catch (javax.script.ScriptException sex) {
+            // javax.script.ScriptException is expected
+        }
+    }
+
     /**
      * Test of invokeFunction method, of class Jsr223JRubyEngine.
      */
@@ -642,6 +657,21 @@ public void testInvokeFunction() throws Exception {
         instance.getBindings(ScriptContext.ENGINE_SCOPE).clear();
     }
 
+    /**
+     * Test of invokeFunction method throwing an exception with a null message.
+     */
+    @Test
+    public void testInvokeFunctionWithJavaException() throws Exception {
+        ScriptEngine instance = newScriptEngine();
+        instance.eval("def trigger_npe\nraise java.lang.NullPointerException.new\nend");
+        try {
+            Object result = ((Invocable) instance).invokeFunction("trigger_npe", null);
+            fail("Expected javax.script.ScriptException");
+        } catch (javax.script.ScriptException sex) {
+            // javax.script.ScriptException is expected
+        }
+    }
+
     /**
      * Test of getInterface method, of class Jsr223JRubyEngine.
      */