From b269a29f78222d4fbcdf2a6c8c5e74022887fd12 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Fri, 30 Aug 2013 18:15:20 -0700
Subject: [PATCH] disk resize NPE, if the new disk offering doesn't have tags,
 then NPE (cherry picked from commit 21a44e3ed10953b47559f1d8482b0c4aec3f6906)

Signed-off-by: animesh <animesh@apache.org>
---
 server/src/com/cloud/storage/VolumeManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index 85a19ca63b3..1d6b44fd7db 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");
                 }