Repository: cloudstack Updated Branches: refs/heads/master 07c30895b -> 0b8355920
volume upload: Use volume/template UUID instead of ID in UploadStatusCommand Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d19ea522 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d19ea522 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d19ea522 Branch: refs/heads/master Commit: d19ea5226a995435848cb8f64ae41af34e8a9655 Parents: 58f2fb1 Author: Koushik Das <kous...@apache.org> Authored: Wed Feb 4 18:35:12 2015 +0530 Committer: Rajani Karuturi <rajanikarut...@gmail.com> Committed: Tue Feb 17 12:31:40 2015 +0530 ---------------------------------------------------------------------- .../cloudstack/storage/command/UploadStatusCommand.java | 10 +++++----- .../com/cloud/storage/ImageStoreUploadMonitorImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d19ea522/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java ---------------------------------------------------------------------- diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java index bad821e..9e6b76e 100644 --- a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java @@ -26,19 +26,19 @@ public class UploadStatusCommand extends Command { Volume, Template } - private long entityId; + private String entityUuid; private EntityType entityType; protected UploadStatusCommand() { } - public UploadStatusCommand(long entityId, EntityType entityType) { - this.entityId = entityId; + public UploadStatusCommand(String entityUuid, EntityType entityType) { + this.entityUuid = entityUuid; this.entityType = entityType; } - public long getEntityId() { - return entityId; + public String getEntityUuid() { + return entityUuid; } public EntityType getEntityType() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d19ea522/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java index 6a27f29..d87fe60 100755 --- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java +++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java @@ -190,7 +190,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto continue; } Host host = _hostDao.findById(ep.getId()); - UploadStatusCommand cmd = new UploadStatusCommand(volume.getId(), EntityType.Volume); + UploadStatusCommand cmd = new UploadStatusCommand(volume.getUuid(), EntityType.Volume); if (host != null && host.getManagementServerId() != null) { if (_nodeId == host.getManagementServerId().longValue()) { Answer answer = null; @@ -227,7 +227,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto continue; } Host host = _hostDao.findById(ep.getId()); - UploadStatusCommand cmd = new UploadStatusCommand(template.getId(), EntityType.Template); + UploadStatusCommand cmd = new UploadStatusCommand(template.getUuid(), EntityType.Template); if (host != null && host.getManagementServerId() != null) { if (_nodeId == host.getManagementServerId().longValue()) { Answer answer = null;
