[Bedework-commit] webapps r1256 - releases/bedework-3.7/webcommon/src/org/bedework/webcommon/schedule

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-15 15:11:06 -0500 (Tue, 15 Feb 2011)
New Revision: 1256

Modified:
   releases/bedework-3.7/webcommon/src/org/bedework/webcommon/schedule/RequestFreeBusy.java
Log:
Fix bad json

Modified: releases/bedework-3.7/webcommon/src/org/bedework/webcommon/schedule/RequestFreeBusy.java
===================================================================
--- releases/bedework-3.7/webcommon/src/org/bedework/webcommon/schedule/RequestFreeBusy.java	2011-02-15 18:54:04 UTC (rev 1255)
+++ releases/bedework-3.7/webcommon/src/org/bedework/webcommon/schedule/RequestFreeBusy.java	2011-02-15 20:11:06 UTC (rev 1256)
@@ -199,7 +199,9 @@
 
     int indentPlus = indent + indentSize;
     outputJsonValue(wtr, indentPlus, "recipient", srr.recipient);
-    outputJsonValue(wtr, indentPlus, "status", String.valueOf(srr.status));
+    outputJsonValue(wtr, indentPlus, "status",
+                    String.valueOf(srr.status),
+                    srr.freeBusy != null);
 
     if (srr.freeBusy != null) {
       outputJson(wtr, indentPlus, srr.freeBusy);
@@ -277,6 +279,15 @@
     outputJsonValue(wtr, indent, val);
   }
 
+  private void outputJsonValue(final Writer wtr,
+                               final int indent,
+                               final String name,
+                               final String val,
+                               final boolean withComma) throws Throwable {
+    outputJsonStart(wtr, indent, name, false);
+    outputJsonValue(wtr, indent, val, withComma);
+  }
+
   private void outputJsonValues(final Writer wtr,
                                 final int indent,
                                 final String name,