From d5a8136f14a01774a0f6976e2ea55478db28101e Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 21 Dec 2010 14:02:59 -0800 Subject: [PATCH] bug 7585: adding logic to ensure empty strings are a valid input during zone edit status 7585: resolved fixed --- .../cloud/configuration/ConfigurationManagerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 1246fceff82..0a72c746cec 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -834,20 +834,20 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura } // Check IP validity for DNS addresses - - if (dns1 != null && !NetUtils.isValidIp(dns1)) { + // Empty strings is a valid input -- hence the length check + if (dns1 != null && dns1.length() > 0 && !NetUtils.isValidIp(dns1)) { throw new InvalidParameterValueException("Please enter a valid IP address for DNS1"); } - if (dns2 != null && !NetUtils.isValidIp(dns2)) { + if (dns2 != null && dns2.length() > 0 && !NetUtils.isValidIp(dns2)) { throw new InvalidParameterValueException("Please enter a valid IP address for DNS2"); } - if (internalDns1 != null && !NetUtils.isValidIp(internalDns1)) { + if ((internalDns1 != null && internalDns1.length() > 0 && !NetUtils.isValidIp(internalDns1))) { throw new InvalidParameterValueException("Please enter a valid IP address for internal DNS1"); } - if (internalDns2 != null && !NetUtils.isValidIp(internalDns2)) { + if (internalDns2 != null && internalDns2.length() > 0 && !NetUtils.isValidIp(internalDns2)) { throw new InvalidParameterValueException("Please enter a valid IP address for internal DNS2"); } }