gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-29 16:44:23 +00:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

asyncmanager is too tightly integrated with api. Can't break them apart at this point. Reverting previous change

Browse Source
This commit is contained in:
Alex Huang 2013-06-09 16:00:47 -07:00
parent 1f3d123866
commit 186e62a868
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/async/AsyncJobManagerImpl.java
View File

@ -51,7 +51,6 @@ import org.apache.cloudstack.framework.jobs.impl.AsyncJobJournalVO;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobMBeanImpl;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueItem;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueItemVO;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueManager;
@ -61,6 +60,7 @@ import org.apache.cloudstack.framework.messagebus.MessageDetector;
import org.apache.cloudstack.framework.messagebus.PublishScope;
import org.apache.cloudstack.messagebus.TopicConstants;
import com.cloud.api.ApiSerializerHelper;
import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterManagerListener;
import com.cloud.cluster.ManagementServerHostVO;
@ -234,7 +234,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setInstanceId(null);
if (resultObject != null) {
job.setResult(JobSerializerHelper.toSerializedString(resultObject));
job.setResult(ApiSerializerHelper.toSerializedString(resultObject));
}
job.setLastUpdated(DateUtil.currentGMTTime());
@ -281,7 +281,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setProcessStatus(processStatus);
if(resultObject != null) {
job.setResult(JobSerializerHelper.toSerializedString(resultObject));
job.setResult(ApiSerializerHelper.toSerializedString(resultObject));
}
job.setLastUpdated(DateUtil.currentGMTTime());
_jobDao.update(jobId, job);
@ -913,7 +913,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
private static String getSerializedErrorMessage(String errorMessage) {
return JobSerializerHelper.toSerializedString(getResetResultResponse(errorMessage));
return ApiSerializerHelper.toSerializedString(getResetResultResponse(errorMessage));
}
@Override