Merge branch 'master' into ruby-2.5

jruby · Feb 24, 2018 · c843e1f · c843e1f
2 parents cea8241 + d81acb8
commit c843e1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java b/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java
@@ -150,12 +150,9 @@ public int parseString(RubyLexer lexer) throws java.io.IOException {
             if (c == '#') {
                 int token = lexer.peekVariableName(RubyParser.tSTRING_DVAR, RubyParser.tSTRING_DBEG);
 
-                if (token != 0) {
-                    return token;
-                } else {
-                    tok.append(c);
-                    c = lexer.nextc();
-                }
+                if (token != 0) return token;
+
+                tok.append('#');
             }
 
             // MRI has extra pointer which makes our code look a little bit more strange in comparison

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);