Updated Branches:
refs/heads/master ac59a4f13 -> 2cca33585
CLOUDSTACK-3924 NPE while internal LB vm is getting created
Issue:
======
Unable to created internalLB Vm. this is due while determining maxconn
value from networkoffering.
to find the networking offering, networkid is passed instead of
networkoffering id which is causing the issue.
fixed:
=====
fixed the issue by passing the network offering id instead of network
id.
Conflicts:
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2cca3358
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2cca3358
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2cca3358
Branch: refs/heads/master
Commit: 2cca335856236aea584d69893b1adf67e5e233ad
Parents: ac59a4f
Author: Rajesh Battala <[email protected]>
Authored: Tue Jul 30 16:26:52 2013 +0530
Committer: Murali Reddy <[email protected]>
Committed: Wed Jul 31 10:53:02 2013 +0530
----------------------------------------------------------------------
.../cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cca3358/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
index e683eb1..7f7c996 100644
---
a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
+++
b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -454,7 +454,7 @@ public class InternalLoadBalancerVMManagerImpl extends
ManagerBase implements
_ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork),
_ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(),
guestNetwork));
- NetworkOffering offering =_networkOfferingDao.findById(guestNetworkId);
+ NetworkOffering offering =
_networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
String maxconn= null;
if (offering.getConcurrentConnections() == null) {
maxconn =
_configDao.getValue(Config.NetworkLBHaproxyMaxConn.key());
