You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/22 23:04:02 UTC
[37/50] [abbrv] git commit: updated refs/heads/ui-vm-affinity to
922b51c
CLOUDSTACK-2065: addNetscalerLoadBalancer is faling to persist
gslb_site_publicip and privateip in db table `external_load_balancer_devices`
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1b9ef85
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1b9ef85
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1b9ef85
Branch: refs/heads/ui-vm-affinity
Commit: f1b9ef858195f8a9c50e9f848547c8abb9c0e8d5
Parents: 6bd18d9
Author: Murali Reddy <mu...@citrix.com>
Authored: Mon Apr 22 19:01:32 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Mon Apr 22 19:01:32 2013 +0530
----------------------------------------------------------------------
.../ExternalLoadBalancerDeviceManagerImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1b9ef85/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
index 7666397..b4662d1 100644
--- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -269,11 +269,11 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
txn.start();
lbDeviceVO = new ExternalLoadBalancerDeviceVO(host.getId(), pNetwork.getId(), ntwkDevice.getNetworkServiceProvder(),
deviceName, capacity, dedicatedUse, gslbProvider);
- _externalLoadBalancerDeviceDao.persist(lbDeviceVO);
- if (!gslbProvider) {
+ if (gslbProvider) {
lbDeviceVO.setGslbSitePrivateIP(gslbSitePublicIp);
lbDeviceVO.setGslbSitePrivateIP(gslbSitePrivateIp);
}
+ _externalLoadBalancerDeviceDao.persist(lbDeviceVO);
DetailVO hostDetail = new DetailVO(host.getId(), ApiConstants.LOAD_BALANCER_DEVICE_ID, String.valueOf(lbDeviceVO.getId()));
_hostDetailDao.persist(hostDetail);