disk resize NPE, if the new disk offering doesn't have tags, then NPE

(cherry picked from commit 21a44e3ed1)

Signed-off-by: animesh <animesh@apache.org>
This commit is contained in:
Edison Su 2013-08-30 18:15:20 -07:00 committed by animesh
parent def926ca5e
commit b269a29f78
1 changed files with 1 additions and 1 deletions

View File

@ -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");
}