Updated Branches: refs/heads/4.2-forward ffc53e81e -> 21a44e3ed
disk resize NPE, if the new disk offering doesn't have tags, then NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21a44e3e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21a44e3e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21a44e3e Branch: refs/heads/4.2-forward Commit: 21a44e3ed10953b47559f1d8482b0c4aec3f6906 Parents: ffc53e8 Author: Edison Su <[email protected]> Authored: Fri Aug 30 18:15:20 2013 -0700 Committer: Edison Su <[email protected]> Committed: Fri Aug 30 18:15:20 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21a44e3e/server/src/com/cloud/storage/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index 85a19ca..1d6b44f 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -1144,7 +1144,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { } if (diskOffering.getTags() != null) { - if (!newDiskOffering.getTags().equals(diskOffering.getTags())) { + if (newDiskOffering.getTags() == null || !newDiskOffering.getTags().equals(diskOffering.getTags())) { throw new InvalidParameterValueException( "Tags on new and old disk offerings must match"); }
