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:56:56 UTC
git commit: updated refs/heads/4.5 to 53ca0b1
Repository: cloudstack
Updated Branches:
refs/heads/4.5 d70937aeb -> 53ca0b186
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>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53ca0b18
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53ca0b18
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53ca0b18
Branch: refs/heads/4.5
Commit: 53ca0b1861c743caf61ec04f776c87eac334f185
Parents: d70937a
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:25:52 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/53ca0b18/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 d0577f4..fa2c80b 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/53ca0b18/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 415f853..c3c36d0 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
@@ -843,7 +843,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/53ca0b18/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 a8fe53a..6e000ef 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
@@ -263,7 +263,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);