From 6946f5ace11ee09395ac5c4b2fb4e9a9fb3ba10e Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 8 Nov 2010 17:10:25 -0800
Subject: [PATCH] bug 7123: populate private/linkLocal ip addresses when addPod
 - added stmt.executeBatch() call to addIpRange methods. status 7123: resolved
 fixed

---
 core/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java     | 4 +++-
 .../com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/core/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
index 1179b188a99..8ff6876c74a 100755
--- a/core/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
+++ b/core/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
@@ -55,6 +55,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
         txn.start();
         DataCenterIpAddressVO  vo = lockOneRandomRow(sc, true);
         if (vo == null) {
+            txn.rollback();
             return null;
         }
         vo.setTakenAt(new Date());
@@ -102,10 +103,11 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
                 stmt.setLong(3, podId);
                 stmt.addBatch();
             }
+            stmt.executeBatch();
             txn.commit();
         } catch (SQLException ex) {
             throw new CloudRuntimeException("Unable to persist ip address range ", ex);
-        }
+        } 
     }
     
     public void releaseIpAddress(String ipAddress, long dcId, Long instanceId) {
diff --git a/core/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/core/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
index d4acd6962d0..1f12d20acdb 100644
--- a/core/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
+++ b/core/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
@@ -94,6 +94,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
                     stmt.setLong(3, podId);
                     stmt.addBatch();
             }
+            stmt.executeBatch();
             txn.commit();
         } catch (SQLException e) {
             throw new CloudRuntimeException("Unable to insert", e);