cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [2/3] git commit: refs/heads/4.1 - CLOUDSTACK-1509. During CreateVLANIPRange while trying to assign Public IPs to a new network if the network offering is persistent we get an NPE. Since associateIpRangeToAccount starts and commits a seaparte transaction
Date Fri, 08 Mar 2013 15:23:52 GMT
CLOUDSTACK-1509. During CreateVLANIPRange while trying to assign Public IPs to a new network
if the network offering is persistent we get an NPE. Since associateIpRangeToAccount starts
and commits a seaparte transaction, commit the transaction started for createVlanAndPublicIpRange
before calling associateIpAddressListToAccount.


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

Branch: refs/heads/4.1
Commit: 4ba28a5ba73d24585e61caa34567d77672e3688c
Parents: fd7f410
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Fri Mar 8 11:58:28 2013 +0530
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Fri Mar 8 10:14:59 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4ba28a5b/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 9e9a1be..da5f99e 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2311,10 +2311,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
         Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork,
podId, startIP, 
                 endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, startIPv6, endIPv6, ip6Gateway,
ip6Cidr);
 
+        txn.commit();
         if (associateIpRangeToAccount) {
             _networkMgr.associateIpAddressListToAccount(userId, vlanOwner.getId(), zoneId,
vlan.getId(), null);
         }
-        txn.commit();
 
         // Associate ips to the network
         if (associateIpRangeToAccount) {


Mime
View raw message