From bbc5bdd83bf3f0e368337aa5ed71e3df09911bbb Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 23 Mar 2011 15:53:31 -0700 Subject: [PATCH] Fixed NPE in diskOffering creation --- server/src/com/cloud/configuration/ConfigurationManager.java | 2 +- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java index 194526cfd6d..a7e625900ac 100644 --- a/server/src/com/cloud/configuration/ConfigurationManager.java +++ b/server/src/com/cloud/configuration/ConfigurationManager.java @@ -82,7 +82,7 @@ public interface ConfigurationManager extends ConfigurationService, Manager { * @param isCustomized * @return newly created disk offering */ - DiskOfferingVO createDiskOffering(long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized); + DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized); /** * Creates a new pod diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index de1709d36f0..1baf9579aeb 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1415,7 +1415,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura } @Override - public DiskOfferingVO createDiskOffering(long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized) throws InvalidParameterValueException { + public DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized) throws InvalidParameterValueException { long diskSize = 0;//special case for custom disk offerings if (numGibibytes != null && (numGibibytes <= 0)) { throw new InvalidParameterValueException("Please specify a disk size of at least 1 Gb.");