From 241622f2a78f17ec9ed86cac992a44926e7a1133 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Tue, 15 Jan 2013 07:59:24 -0500
Subject: fix a bug in the JRuby implementation. getInstanceVariable() can
 return a null which causes NPE.

---
 java/src/json/ext/GeneratorState.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'java/src/json/ext/GeneratorState.java')

diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java
index 658d6d0..3065307 100644
--- a/java/src/json/ext/GeneratorState.java
+++ b/java/src/json/ext/GeneratorState.java
@@ -263,7 +263,8 @@ public class GeneratorState extends RubyObject {
         if (getMetaClass().isMethodBound(name, true)) {
             return send(context, vName, Block.NULL_BLOCK);
         } else {
-            return getInstanceVariables().getInstanceVariable("@" + name);
+            IRubyObject value = getInstanceVariables().getInstanceVariable("@" + name);
+            return value == null ? context.nil : value;
         }
     }
 
-- 
cgit v1.2.1