From 7377a7ba2622dac0f31c8d81c9a8586ba5319502 Mon Sep 17 00:00:00 2001
From: shwet Shashank <shwet.shashank@flipkart.com>
Date: Tue, 11 Jun 2013 15:33:26 +0530
Subject: [PATCH 1/2] fixing the agentStatus null issue

---
 .../src/main/java/perf/server/domain/Job.java | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/loader-server/src/main/java/perf/server/domain/Job.java b/loader-server/src/main/java/perf/server/domain/Job.java
index d7d9dd1..1ff7cd0 100644
--- a/loader-server/src/main/java/perf/server/domain/Job.java
+++ b/loader-server/src/main/java/perf/server/domain/Job.java
@@ -1,12 +1,26 @@
 package perf.server.domain;
 
-import com.open.perf.domain.Load;
-import com.open.perf.jackson.ObjectMapperUtil;
-import com.open.perf.util.FileHelper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import perf.server.cache.AgentsCache;
 import perf.server.client.LoaderAgentClient;
 import perf.server.client.MonitoringClient;
@@ -17,9 +31,10 @@
 import perf.server.exception.JobException;
 import perf.server.util.DeploymentHelper;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
+import com.open.perf.domain.Load;
+import com.open.perf.jackson.ObjectMapperUtil;
+import com.open.perf.util.FileHelper;
+
 
 public class Job {
 
@@ -39,10 +54,10 @@ public static enum JOB_STATUS {
     private Set<String> monitoringAgents;
 
     public static class AgentJobStatus {
-        private String agentIp;
-        private boolean inStress;
-        private JOB_STATUS job_status;
-        private Map<String, Object> healthStatus;
+        private String agentIp=null;
+        private boolean inStress=false;
+        private JOB_STATUS job_status=null;
+        private Map<String, Object> healthStatus=null;
 
         public String getAgentIp() {
             return agentIp;
@@ -251,6 +266,7 @@ private void ended() throws IOException, ExecutionException, InterruptedExceptio
     public void failedToStart() throws IOException {
         this.jobStatus = JOB_STATUS.FAILED_TO_START;
         this.endTime = new Date();
+        //this.agentsJobStatus.put("", arg1)
         this.persist();
     }
 

From 3698b7d653c830da9ccbd87e62f604e3824efca4 Mon Sep 17 00:00:00 2001
From: flouser <flouser@debian.corp.flipkart.com>
Date: Tue, 11 Jun 2013 16:08:35 +0530
Subject: [PATCH 2/2] fixing healthstatus

---
 loader-server/src/main/java/perf/server/domain/Job.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/loader-server/src/main/java/perf/server/domain/Job.java b/loader-server/src/main/java/perf/server/domain/Job.java
index c050738..ad70aa0 100644
--- a/loader-server/src/main/java/perf/server/domain/Job.java
+++ b/loader-server/src/main/java/perf/server/domain/Job.java
@@ -9,6 +9,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,7 +60,7 @@ public static class AgentJobStatus {
         private String agentIp=null;
         private boolean inStress=false;
         private JOB_STATUS job_status=null;
-        private Map<String, Object> healthStatus=null;
+        private Map<String, Object> healthStatus=new HashMap<String, Object>();
 
         public String getAgentIp() {
             return agentIp;