zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_900462 into lp:zorba/data-converters-module.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #900462 in Zorba: "json:serialize returns invalid json"
  https://bugs.launchpad.net/zorba/+bug/900462

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug_900462/+merge/84794

Fixed bug #900462 (json:serialize returns invalid json)
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug_900462/+merge/84794
Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module.

=== modified file 'src/com/zorba-xquery/www/modules/converters/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/converters/CMakeLists.txt	2011-12-05 22:42:10 +0000
+++ src/com/zorba-xquery/www/modules/converters/CMakeLists.txt	2011-12-07 16:19:30 +0000
@@ -62,8 +62,6 @@
     DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/converters/json"; VERSION 1.0 FILE "json.xq" LINK_LIBRARIES "${Jansson_LIBRARIES}")
     ADD_TEST_DIRECTORY ("${PROJECT_SOURCE_DIR}/test_json")
 
-    EXPECTED_FAILURE(zorba_data-converters_module/converters/jansson/serialize_json_18.xq 900462)
-
     IF(ZORBA_NO_UNICODE)
       SET_TESTS_PROPERTIES(zorba_data-converters_module/converters/jansson/parse_json_03.xq
                           PROPERTIES WILL_FAIL TRUE)

=== modified file 'src/com/zorba-xquery/www/modules/converters/json.xq.src/jansson_wrapper.cpp'
--- src/com/zorba-xquery/www/modules/converters/json.xq.src/jansson_wrapper.cpp	2011-10-06 07:40:17 +0000
+++ src/com/zorba-xquery/www/modules/converters/json.xq.src/jansson_wrapper.cpp	2011-12-07 16:19:30 +0000
@@ -473,14 +473,11 @@
     aResultSs << "[";
 
   serialize_child(aElement, aResultSs, aErrorLogSs, "object");
-
-  if(!aErrorLogSs.str().empty())
-  {
-    if(lType == "object")
-      aResultSs << "}";
-    else
-      aResultSs << "]";
-  }
+  
+  if(lType == "object")
+    aResultSs << "}";
+  else
+    aResultSs << "]";
 }
 
 static void parse_JSON_ML_value(