[refactor] minor - env isn't null around here

kares · kares · commit 683a26cf3df5 · 2018-12-01T10:52:25.000+01:00
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1683,10 +1683,7 @@ public static IRubyObject system(ThreadContext context, IRubyObject recv, IRubyO
 
         // else old JDK logic
         if (args[0] instanceof RubyHash) {
-            RubyHash env = args[0].convertToHash();
-            if (env != null) {
-                runtime.getENV().merge_bang(context, env, Block.NULL_BLOCK);
-            }
+            runtime.getENV().merge_bang(context, (RubyHash) args[0], Block.NULL_BLOCK);
             // drop the first element for calling systemCommon()
             args = ArraySupport.newCopy(args, 1, args.length - 1);
         }
@@ -1775,7 +1772,7 @@ private static IRubyObject execCommon(ThreadContext context, IRubyObject env, IR
             }
         }
 
-        if (env != null && !env.isNil()) {
+        if (env != null && env != context.nil) {
             RubyHash envMap = env.convertToHash();
             if (envMap != null) {
                 runtime.getENV().merge_bang(context, envMap, Block.NULL_BLOCK);

Original file line number	Diff line number	Diff line change
`@@ -1683,10 +1683,7 @@ public static IRubyObject system(ThreadContext context, IRubyObject recv, IRubyO`
`1683`	`1683`
`1684`	`1684`	`// else old JDK logic`
`1685`	`1685`	`if (args[0] instanceof RubyHash) {`
`1686`		`- RubyHash env = args[0].convertToHash();`
`1687`		`- if (env != null) {`
`1688`		`- runtime.getENV().merge_bang(context, env, Block.NULL_BLOCK);`
`1689`		`- }`
	`1686`	`+ runtime.getENV().merge_bang(context, (RubyHash) args[0], Block.NULL_BLOCK);`
`1690`	`1687`	`// drop the first element for calling systemCommon()`
`1691`	`1688`	`args = ArraySupport.newCopy(args, 1, args.length - 1);`
`1692`	`1689`	`}`
`@@ -1775,7 +1772,7 @@ private static IRubyObject execCommon(ThreadContext context, IRubyObject env, IR`
`1775`	`1772`	`}`
`1776`	`1773`	`}`
`1777`	`1774`
`1778`		`- if (env != null && !env.isNil()) {`
	`1775`	`+ if (env != null && env != context.nil) {`
`1779`	`1776`	`RubyHash envMap = env.convertToHash();`
`1780`	`1777`	`if (envMap != null) {`
`1781`	`1778`	`runtime.getENV().merge_bang(context, envMap, Block.NULL_BLOCK);`