You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/20 12:57:20 UTC
git commit: updated refs/heads/master to 694b723
Repository: cloudstack
Updated Branches:
refs/heads/master 62a733e8c -> 694b72389
CLOUDSTACK-8312: Fix NPE regression, copy template can have NULL volume size
The copy command reply can have null size returned, so check and set values
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 53ca0b1861c743caf61ec04f776c87eac334f185)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/694b7238
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/694b7238
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/694b7238
Branch: refs/heads/master
Commit: 694b7238998a8f7b03662fe50017de9d80d969c0
Parents: 62a733e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Mar 20 17:25:52 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Mar 20 17:27:14 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/storage/image/store/TemplateObject.java | 4 +++-
.../hypervisor/xenserver/resource/XenServerStorageProcessor.java | 4 +++-
.../xenserver/resource/Xenserver625StorageProcessor.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694b7238/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
index 6fa4aab..c5ca5b9 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -190,7 +190,9 @@ public class TemplateObject implements TemplateInfo {
TemplateObjectTO newTemplate = (TemplateObjectTO)cpyAnswer.getNewData();
VMTemplateStoragePoolVO templatePoolRef = templatePoolDao.findByPoolTemplate(getDataStore().getId(), getId());
templatePoolRef.setDownloadPercent(100);
- templatePoolRef.setTemplateSize(newTemplate.getSize());
+ if (newTemplate.getSize() != null) {
+ templatePoolRef.setTemplateSize(newTemplate.getSize());
+ }
templatePoolRef.setDownloadState(Status.DOWNLOADED);
templatePoolRef.setLocalDownloadPath(newTemplate.getPath());
templatePoolRef.setInstallPath(newTemplate.getPath());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694b7238/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index f3cb419..10a97a2 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -877,7 +877,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
newVol.setUuid(uuidToReturn);
newVol.setPath(uuidToReturn);
- newVol.setSize(physicalSize);
+ if (physicalSize != null) {
+ newVol.setSize(physicalSize);
+ }
newVol.setFormat(ImageFormat.VHD);
return new CopyCmdAnswer(newVol);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694b7238/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index 73c15fb..c4f2dc9 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@ -292,7 +292,9 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
newVol.setUuid(uuidToReturn);
newVol.setPath(uuidToReturn);
- newVol.setSize(physicalSize);
+ if (physicalSize != null) {
+ newVol.setSize(physicalSize);
+ }
newVol.setFormat(Storage.ImageFormat.VHD);
return new CopyCmdAnswer(newVol);