Minor cleanup of emitter code.

1 files changed, 9 insertions, 6 deletions

diff --git a/ext/java/org/jruby/ext/psych/PsychEmitter.java b/ext/java/org/jruby/ext/psych/PsychEmitter.java
index ac4316b..f2e6498 100644
--- a/ext/java/org/jruby/ext/psych/PsychEmitter.java
+++ b/ext/java/org/jruby/ext/psych/PsychEmitter.java
@@ -131,16 +131,19 @@ public class PsychEmitter extends RubyObject {
 
     @JRubyMethod
     public IRubyObject start_document(ThreadContext context, IRubyObject _version, IRubyObject tags, IRubyObject implicit) {
+        Ruby runtime = context.runtime;
+
         DumperOptions.Version version = null;
         boolean implicitBool = implicit.isTrue();
         Map<String, String> tagsMap = null;
 
-        TypeConverter.checkType(context, _version, context.runtime.getArray());
+        RubyClass arrayClass = runtime.getArray();
+        TypeConverter.checkType(context, _version, arrayClass);
 
         RubyArray versionAry = _version.convertToArray();
         if (versionAry.size() == 2) {
-            int versionInt0 = (int)versionAry.eltInternal(0).convertToInteger().getLongValue();
-            int versionInt1 = (int)versionAry.eltInternal(1).convertToInteger().getLongValue();
+            int versionInt0 = versionAry.eltInternal(0).convertToInteger().getIntValue();
+            int versionInt1 = versionAry.eltInternal(1).convertToInteger().getIntValue();
 
             if (versionInt0 == 1) {
                 if (versionInt1 == 0) {
@@ -150,12 +153,12 @@ public class PsychEmitter extends RubyObject {
                 }
             }
             if (version == null) {
-                throw context.runtime.newArgumentError("invalid YAML version: " + versionAry);
+                throw runtime.newArgumentError("invalid YAML version: " + versionAry);
             }
         }
 
         if (!tags.isNil()) {
-            TypeConverter.checkType(context, tags, context.runtime.getArray());
+            TypeConverter.checkType(context, tags, arrayClass);
 
             RubyArray tagsAry = tags.convertToArray();
             if (tagsAry.size() > 0) {
@@ -163,7 +166,7 @@ public class PsychEmitter extends RubyObject {
                 for (int i = 0; i < tagsAry.size(); i++) {
                     RubyArray tagsTuple = tagsAry.eltInternal(i).convertToArray();
                     if (tagsTuple.size() != 2) {
-                        throw context.runtime.newRuntimeError("tags tuple must be of length 2");
+                        throw runtime.newRuntimeError("tags tuple must be of length 2");
                     }
                     IRubyObject key = tagsTuple.eltInternal(0);
                     IRubyObject value = tagsTuple.eltInternal(1);