From fe93821bb182f7598ed41bb12f4996a81844cc83 Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 19 Nov 2010 16:12:35 -0800 Subject: [PATCH] Fixed editZone command - if dns2 is not specified, keep the old value instead of updating it to NULL --- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index ceff0b37611..023c3dea0b7 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -911,6 +911,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura dns1 = zone.getDns1(); } + if (dns2 == null) { + dns2 = zone.getDns2(); + } + if(internalDns1 == null) { internalDns1 = zone.getInternalDns1();