Merge branch 'jruby-9.1'

jruby · Feb 24, 2018 · d81acb8 · d81acb8
2 parents d532366 + b8e7856
commit d81acb8
Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/StringTerm.java b/core/src/main/java/org/jruby/lexer/yacc/StringTerm.java
@@ -87,7 +87,6 @@ private int endFound(RubyLexer lexer) throws IOException {
             }
 
             lexer.setValue("" + end);
-
             return RubyParser.tSTRING_END;
     }
 

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -245,7 +245,7 @@ public static String dump() {
 
     // Most (all?) OpenJDK default this to false. See jruby/jruby#4869
     @Deprecated
-    public static final Option<Boolean> PREFER_IPV4 = bool(MISCELLANEOUS, "net.preferIPv4", SafePropertyAccessor.getBoolean("java.net.preferIPv4Stack", false), "(DEPRECATED) Prefer IPv4 network stack");
+    public static final Option<Boolean> PREFER_IPV4 = bool(MISCELLANEOUS, "net.preferIPv4", false, "(DEPRECATED) Prefer IPv4 network stack");
 
     private static Option<String> string(Category category, String name, String[] options, String defval, String description) {
         Option<String> option = Option.string("jruby", name, category, options, defval, description);
-Original file line number
+Diff line change
@@ @@ -87,7 +87,6 @@ private int endFound(RubyLexer lexer) throws IOException { @@
                 }
                 lexer.setValue("" + end);
                 return RubyParser.tSTRING_END;
         }