From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Tue, 17 Jul 2007 14:48:57 +0000 (+0000)
Subject: returning json NULL object (instead of raw NULL) when cloningNULL items.  this ensure... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=83f137186643b991a715bed784253745d5a57aeb;p=OpenSRF.git

returning json NULL object (instead of raw NULL) when cloningNULL items.  this ensures lists/hashes with raw NULL items are fully fleshed on clone, since jsonObjectSetIndex requires a non-NULL item

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/new-json2@1042 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/src/libopensrf/osrf_json_object.c b/src/libopensrf/osrf_json_object.c
index a4914c6..940dc55 100644
--- a/src/libopensrf/osrf_json_object.c
+++ b/src/libopensrf/osrf_json_object.c
@@ -152,9 +152,9 @@ char* jsonObjectToJSONRaw( const jsonObject* obj ) {
 
 		case JSON_NUMBER: {
 			double x = obj->value.n;
-			if( x == (long) x ) {
-				LONG_TO_STRING((long)x);	
-				OSRF_BUFFER_ADD(buf, LONGSTR);
+			if( x == (int) x ) {
+				INT_TO_STRING((int)x);	
+				OSRF_BUFFER_ADD(buf, INTSTR);
 
 			} else {
 				DOUBLE_TO_STRING(x);
@@ -316,7 +316,7 @@ const char* jsonObjectGetClass(const jsonObject* dest) {
 }
 
 jsonObject* jsonObjectClone( const jsonObject* o ) {
-    if(!o) return NULL;
+    if(!o) return jsonNewObject(NULL);
 
     int i;
     jsonObject* arr; 
@@ -375,8 +375,8 @@ char* jsonObjectToSimpleString( const jsonObject* o ) {
 		case JSON_NUMBER: {
 
 			if( o->value.n == (int) o->value.n ) {
-				LONG_TO_STRING((long) o->value.n);	
-				value = strdup(LONGSTR);
+				INT_TO_STRING((int) o->value.n);	
+				value = strdup(INTSTR);
 
 			} else {
 				DOUBLE_TO_STRING(o->value.n);