Merge branch 'ob-10.0' into 10.0

e37372c1 · Olivier Bertrand · 3f6159f7 · 6883e5c4 · e37372c1
Commit e37372c1 authored Dec 27, 2015 by Olivier Bertrand
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/connect/json.cpp storage/connect/json.cpp +2 -2

No files found.
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -594,8 +594,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
  if (fs) {
 		fputs(EL, fs);
    fclose(fs);
-		str = (err) ? NULL : "Ok";
-  } else if (!err) {
+		str = (err) ? NULL : strcpy(g->Message, "Ok");
+	} else if (!err) {
    str = ((JOUTSTR*)jp)->Strp;
    jp->WriteChr('\0');
    PlugSubAlloc(g, NULL, ((JOUTSTR*)jp)->N);