etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7585: adding logic to ensure empty strings are a valid input during zone edit 

status 7585: resolved fixed
This commit is contained in:
abhishek 2010-12-21 14:02:59 -08:00
parent a85343f61f
commit d5a8136f14
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

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