Emit 'result' and 'status' field when useStatusFormat is enabled.

To increase backward compatibility.
jenkinsci · Jul 13, 2013 · 40250b1 · 40250b1
1 parent 0b99aa8
commit 40250b1
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/org/codefirst/jenkins/wsnotifier/WsServer.java b/src/main/java/org/codefirst/jenkins/wsnotifier/WsServer.java
@@ -54,18 +54,21 @@ static public void send(AbstractBuild build, boolean useStatusFormat){
     }
 
     static public void send(AbstractBuild build, String result, boolean useStatusFormat){
-        String statusName = useStatusFormat ? "status" : "result";
         if (result == null){
             result = build.getResult().toString();
         }
-        String json = new JSONObject()
+        JSONObject json = new JSONObject()
             .element("project", build.getProject().getName())
             .element("number" , new Integer(build.getNumber()))
-            .element(statusName , result)
-            .toString();
+            .element("status", result);
+
+        // for backward compatibilty
+        try{
+            json.element("result", build.getResult().toString());
+        }catch(Exception e) {}
 
         for(WebSocketConnection con : connections){
-            con.send(json);
+            con.send(json.toString());
         }
 
         // it's not necessary to send out a ping immediately or shortly after having send a client message.