json: correctly handle array of special objects

In case of array of STL vectors like std::vector<double> fMember[5]; One should flush value before writing array Signed-off-by: Sergey Linev <[email protected]>
saberduck · Nov 7, 2016 · 72332fe · 72332fe
1 parent e2c5725
commit 72332fe
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/io/io/src/TBufferJSON.cxx b/io/io/src/TBufferJSON.cxx
@@ -2459,6 +2459,11 @@ void  TBufferJSON::WriteFastArray(void *start, const TClass *cl, Int_t n,
       if (j > 0) AppendOutput(fArraySepar.Data());
 
       JsonWriteObject(obj, cl, kFALSE);
+
+      if ((n > 1) && (fValue.Length() > 0)) {
+         AppendOutput(fValue.Data());
+         fValue.Clear();
+      }
    }
 
    if (n > 1) {
@@ -2496,6 +2501,10 @@ Int_t TBufferJSON::WriteFastArray(void **start, const TClass *cl, Int_t n,
       for (Int_t j = 0; j < n; j++) {
          if (j > 0) AppendOutput(fArraySepar.Data());
          res |= WriteObjectAny(start[j], cl);
+         if ((n > 1) && (fValue.Length() > 0)) {
+            AppendOutput(fValue.Data());
+            fValue.Clear();
+         }
       }
 
    } else {
@@ -2507,6 +2516,11 @@ Int_t TBufferJSON::WriteFastArray(void **start, const TClass *cl, Int_t n,
          if (!start[j]) start[j] = ((TClass *)cl)->New();
          // ((TClass*)cl)->Streamer(start[j],*this);
          JsonWriteObject(start[j], cl, kFALSE);
+
+         if ((n > 1) && (fValue.Length() > 0)) {
+            AppendOutput(fValue.Data());
+            fValue.Clear();
+         }
       }
    }