Merge pull request #7510 from enebo/writer_subclass

enebo · web-flow · commit cb4e7fc4efe6 · 2022-12-05T10:17:31.000-06:00
Fixes #7479. Cannot sub-class Zlib::GzipWriter and call .wrap
diff --git a/core/src/main/java/org/jruby/ext/zlib/RubyGzipFile.java b/core/src/main/java/org/jruby/ext/zlib/RubyGzipFile.java
@@ -33,6 +33,7 @@
 import org.jruby.Ruby;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
+import org.jruby.RubyModule;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.RubyTime;
@@ -41,7 +42,6 @@
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.JavaSites;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -87,8 +87,7 @@ public static IRubyObject wrap19(ThreadContext context, IRubyObject recv, IRubyO
         Ruby runtime = recv.getRuntime();
         RubyGzipFile instance;
 
-        // TODO: People extending GzipWriter/reader will break.  Find better way here.
-        if (recv == runtime.getModule("Zlib").getClass("GzipWriter")) {
+        if (((RubyModule) recv).isKindOfModule(runtime.getModule("Zlib").getClass("GzipWriter"))) {
             instance = JZlibRubyGzipWriter.newInstance(recv, args);
         } else {
             instance = JZlibRubyGzipReader.newInstance(recv, args);
