From 8f63c2cf9c463373d774cb563e63fc56828e1418 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Mon, 3 Feb 2014 12:16:19 -0800 Subject: [PATCH] CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root volume with S3 as secondary storage. (cherry picked from commit 402254337c8f29e5bdef4996953284d36043f8ea) Signed-off-by: Animesh Chaturvedi --- .../apache/cloudstack/storage/snapshot/SnapshotObject.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index 314ce8ee928..a69b2d77f02 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -288,7 +288,10 @@ public class SnapshotObject implements SnapshotInfo { } else if (answer instanceof CopyCmdAnswer) { SnapshotObjectTO snapshotTO = (SnapshotObjectTO) ((CopyCmdAnswer) answer).getNewData(); snapshotStore.setInstallPath(snapshotTO.getPath()); - snapshotStore.setSize(snapshotTO.getPhysicalSize()); + if (snapshotTO.getPhysicalSize() != null) { + // For S3 delta snapshot, physical size is currently not set + snapshotStore.setSize(snapshotTO.getPhysicalSize()); + } if (snapshotTO.getParentSnapshotPath() == null) { snapshotStore.setParentSnapshotId(0L); }