Merge branch 'jruby-9.1'

jruby · Mar 15, 2018 · 81c1bd3 · 81c1bd3
2 parents d347a5a + 2a1313c
commit 81c1bd3
Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -105,7 +105,7 @@ public String getMethodName() {
 
     @JRubyMethod(name = "owner")
     public IRubyObject owner(ThreadContext context) {
-        return method.getDefinedClass();
+        return method.getRealMethod().getDefinedClass();
     }
 
     @JRubyMethod(name = "source_location")

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -2054,6 +2054,8 @@ protected IRubyObject rbIoClose(ThreadContext context) {
 
             fptr.finalizeFlush(context, false);
 
+            fptr.finalizeFlush(context, false);
+
             // interrupt waiting threads
             fptr.interruptBlockingThreads(context);
             try {