Fixed NPE in listAsyncJob apis: don't include instanceId/instanceType in the response when these values are null

This commit is contained in:
alena 2011-02-07 12:54:13 -08:00
parent c6fe6f2f45
commit 5c2bbf48f0

View File

@ -1789,8 +1789,11 @@ public class ApiResponseHelper implements ResponseGenerator {
jobResponse.setCmd(job.getCmd());
jobResponse.setCreated(job.getCreated());
jobResponse.setId(job.getId());
jobResponse.setJobInstanceId(job.getInstanceId());
jobResponse.setJobInstanceType(job.getInstanceType().toString());
if (job.getInstanceType() != null && job.getInstanceId() != null) {
jobResponse.setJobInstanceId(job.getInstanceId());
jobResponse.setJobInstanceType(job.getInstanceType().toString());
}
jobResponse.setJobProcStatus(job.getProcessStatus());
jobResponse.setJobResult((ResponseObject)ApiSerializerHelper.fromSerializedString(job.getResult()));
jobResponse.setJobResultCode(job.getResultCode());