call Hash#merge directly - no sense to account for patches here

kares · kares · commit 989ca4235f26 · 2016-12-02T06:37:40.000+01:00
diff --git a/src/main/java/org/jruby/ext/openssl/SSLContext.java b/src/main/java/org/jruby/ext/openssl/SSLContext.java
@@ -557,7 +557,7 @@ public IRubyObject set_params(final ThreadContext context, final IRubyObject[] a
         RubyHash DEFAULT_PARAMS = (RubyHash) SSLContext.getConstantAt("DEFAULT_PARAMS");
         if ( args.length == 0 ) params = DEFAULT_PARAMS;
         else {
-            params = (RubyHash) DEFAULT_PARAMS.callMethod(context, "merge", args[0]);
+            params = (RubyHash) DEFAULT_PARAMS.merge(context, args[0], Block.NULL_BLOCK);
         }
         final SSLContext self = this;
         params.visitAll(new RubyHash.Visitor() {

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ public IRubyObject set_params(final ThreadContext context, final IRubyObject[] a`
`557`	`557`	`RubyHash DEFAULT_PARAMS = (RubyHash) SSLContext.getConstantAt("DEFAULT_PARAMS");`
`558`	`558`	`if ( args.length == 0 ) params = DEFAULT_PARAMS;`
`559`	`559`	`else {`
`560`		`- params = (RubyHash) DEFAULT_PARAMS.callMethod(context, "merge", args[0]);`
	`560`	`+ params = (RubyHash) DEFAULT_PARAMS.merge(context, args[0], Block.NULL_BLOCK);`
`561`	`561`	`}`
`562`	`562`	`final SSLContext self = this;`
`563`	`563`	`params.visitAll(new RubyHash.Visitor() {`