incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [27/50] [abbrv] git commit: 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).
Date Fri, 29 Jun 2012 00:45:07 GMT
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).


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3938c24b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3938c24b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3938c24b

Branch: refs/heads/vpc
Commit: 3938c24b45159640d605d7f9a4166af21e6dbf05
Parents: 6015df9
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Wed Jun 27 16:42:43 2012 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Wed Jun 27 16:57:03 2012 -0700

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java    |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3938c24b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index d489108..078916e 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();
         }


Mime
View raw message