Merge branch 'jruby-9.1'

headius · headius · commit 81c1bd3e4aeb · 2018-03-15T15:23:08.000-05:00
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 {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public String getMethodName() {`
`105`	`105`
`106`	`106`	`@JRubyMethod(name = "owner")`
`107`	`107`	`public IRubyObject owner(ThreadContext context) {`
`108`		`- return method.getDefinedClass();`
	`108`	`+ return method.getRealMethod().getDefinedClass();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@JRubyMethod(name = "source_location")`