cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [18/24] git commit: updated refs/heads/master to 81ff479
Date Thu, 26 Sep 2013 01:01:22 GMT
  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/d1a14fbf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1a14fbf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1a14fbf

Branch: refs/heads/master
Commit: d1a14fbf9549aa6c25526729fc32c6a5fb20b364
Parents: 0eb3944
Author: Edison Su <sudison@gmail.com>
Authored: Wed Sep 25 16:29:01 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 25 16:29:01 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1a14fbf/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index cc99589..16eecd6 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -757,7 +757,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             }
 
             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");
                 }
             } else if (newDiskOffering.getTags() != null) {


Mime
View raw message