From 709e878e43f63db66c1bd0c66273fbf89b04edbf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 27 Jun 2012 16:42:43 -0700 Subject: [PATCH] CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2). --- .../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 575a3f766c5..83ea5b68758 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1427,6 +1427,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura internalDns1 = zone.getInternalDns1(); } + if (internalDns2 == null) { + internalDns2 = zone.getInternalDns2(); + } + if (guestCidr == null) { guestCidr = zone.getGuestNetworkCidr(); }