From 4e7e4ffac4ca8b41d57378daccd8f7f84068dffe Mon Sep 17 00:00:00 2001
From: "Paul J. Davis" <paul.joseph.davis@gmail.com>
Date: Tue, 4 Feb 2014 22:20:32 -0600
Subject: [PATCH] Switch JSON encoding/decoding to Jiffy


diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 6888f10da..3bc288845 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -23,8 +23,8 @@
 
 -define(REWRITE_COUNT, couch_rewrite_count).
 
--define(JSON_ENCODE(V), ejson:encode(V)).
--define(JSON_DECODE(V), ejson:decode(V)).
+-define(JSON_ENCODE(V), jiffy:encode(V, [force_utf8])).
+-define(JSON_DECODE(V), try jiffy:decode(V) catch throw:Error -> throw({invalid_json, Error}) end).
 
 -define(b2l(V), binary_to_list(V)).
 -define(l2b(V), list_to_binary(V)).