File _service:tar_scm:jruby-snakeyaml-1.20.patch of Package jruby

File _service:tar_scm:jruby-snakeyaml-1.20.patch of Package jruby (Revision a4708844c348cfcdf02bef9057832bab)

Currently displaying revision a4708844c348cfcdf02bef9057832bab , Show latest

diff --git a/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java b/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java
index d9f3231..4a0ba0d 100644
--- a/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java
+++ b/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java
@@ -330,7 +330,7 @@ public class PsychEmitter extends RubyObject {
     DumperOptions options = new DumperOptions();
     IRubyObject io;
 
-    private static final Mark NULL_MARK = new Mark(null, 0, 0, 0, null, 0);
+    private static final Mark NULL_MARK = new Mark((String) null, 0, 0, 0, (String) null, 0);
 
     // Map style constants from Psych values (ANY = 0 ... FOLDED = 5)
     // to SnakeYaml values; see psych/nodes/scalar.rb.
diff --git a/core/src/main/java/org/jruby/ext/psych/PsychParser.java b/core/src/main/java/org/jruby/ext/psych/PsychParser.java
index 33a98b5..7cff388 100644
--- a/core/src/main/java/org/jruby/ext/psych/PsychParser.java
+++ b/core/src/main/java/org/jruby/ext/psych/PsychParser.java
@@ -345,10 +345,10 @@ public class PsychParser extends RubyObject {
         }
     }
     
-    private static int translateFlowStyle(Boolean flowStyle) {
+    private static int translateFlowStyle(DumperOptions.FlowStyle flowStyle) {
         if (flowStyle == null) return 0; // any
 
-        if (flowStyle) return 2;
+        if (flowStyle.getStyleBoolean()) return 2;
         return 1;
     }