From 5fd6c4e168005c68995a97ef436725a01c42dfd9 Mon Sep 17 00:00:00 2001 From: Florian Frank Date: Thu, 25 Feb 2016 00:10:42 +0100 Subject: Call OBJECT_HANDLER for objects without #to_json as a last-ditch effort. --- java/src/json/ext/Generator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/java/src/json/ext/Generator.java b/java/src/json/ext/Generator.java index d9be209..bb3a394 100644 --- a/java/src/json/ext/Generator.java +++ b/java/src/json/ext/Generator.java @@ -427,11 +427,14 @@ public final class Generator { new Handler() { @Override RubyString generateNew(Session session, IRubyObject object) { - IRubyObject result = - object.callMethod(session.getContext(), "to_json", - new IRubyObject[] {session.getState()}); - if (result instanceof RubyString) return (RubyString)result; - throw session.getRuntime().newTypeError("to_json must return a String"); + if (object.respondsTo("to_json")) { + IRubyObject result = object.callMethod(session.getContext(), "to_json", + new IRubyObject[] {session.getState()}); + if (result instanceof RubyString) return (RubyString)result; + throw session.getRuntime().newTypeError("to_json must return a String"); + } else { + return OBJECT_HANDLER.generateNew(session, object); + } } @Override -- cgit v1.2.1