diff --git a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
index abe940f090a..a410b3a686c 100755
--- a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
+++ b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
@@ -25,6 +25,7 @@ import java.util.List;
 
 import com.cloud.dc.DataCenterVnetVO;
 import com.cloud.exception.InternalErrorException;
+import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
@@ -33,121 +34,136 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 /**
- * DataCenterVnetDaoImpl maintains the one-to-many relationship between
- * data center and the vnet that appears within its network.
+ * DataCenterVnetDaoImpl maintains the one-to-many relationship between data
+ * center and the vnet that appears within its network.
  */
-public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long> implements GenericDao<DataCenterVnetVO, Long> {
-    private final SearchBuilder<DataCenterVnetVO> FreeVnetSearch;
-    private final SearchBuilder<DataCenterVnetVO> VnetDcSearch;
-    private final SearchBuilder<DataCenterVnetVO> VnetDcSearchAllocated;
-    private final SearchBuilder<DataCenterVnetVO> DcSearchAllocated;
-    
-    public List<DataCenterVnetVO> listAllocatedVnets(long dcId) {
-    	SearchCriteria sc = DcSearchAllocated.create();
-    	sc.setParameters("dc", dcId);
-    	return listActiveBy(sc);
-    }
-    
-    public List<DataCenterVnetVO> findVnet(long dcId, String vnet) {
-    	SearchCriteria sc = VnetDcSearch.create();;
-    	sc.setParameters("dc", dcId);
-    	sc.setParameters("vnet", vnet);
-    	return listActiveBy(sc);
-    }
-    
-    public void add(long dcId, int start, int end) {
-        String insertVnet = "INSERT INTO `cloud`.`op_dc_vnet_alloc` (vnet, data_center_id) VALUES ( ?, ?)";
-        
-        Transaction txn = Transaction.currentTxn();
-        try {
-            txn.start();
-            PreparedStatement stmt = txn.prepareAutoCloseStatement(insertVnet);
-            for (int i = start; i < end; i++) {
-                stmt.setString(1, String.valueOf(i));
-                stmt.setLong(2, dcId);
-                stmt.addBatch();
-            }
-            stmt.executeBatch();
-            txn.commit();
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Exception caught adding vnet ", e);
-        }
-    }
-    
-    public void delete(long dcId) {
-    	String deleteVnet = "DELETE FROM `cloud`.`op_dc_vnet_alloc` WHERE data_center_id = ?";
+public class DataCenterVnetDaoImpl extends
+		GenericDaoBase<DataCenterVnetVO, Long> implements
+		GenericDao<DataCenterVnetVO, Long> {
+	private final SearchBuilder<DataCenterVnetVO> FreeVnetSearch;
+	private final SearchBuilder<DataCenterVnetVO> VnetDcSearch;
+	private final SearchBuilder<DataCenterVnetVO> VnetDcSearchAllocated;
+	private final SearchBuilder<DataCenterVnetVO> DcSearchAllocated;
 
-        Transaction txn = Transaction.currentTxn();
-        try {
-            PreparedStatement stmt = txn.prepareAutoCloseStatement(deleteVnet);
-            stmt.setLong(1, dcId);
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-        	throw new CloudRuntimeException("Exception caught deleting vnet ", e);
-        }
-    }
+	public List<DataCenterVnetVO> listAllocatedVnets(long dcId) {
+		SearchCriteria sc = DcSearchAllocated.create();
+		sc.setParameters("dc", dcId);
+		return listActiveBy(sc);
+	}
 
-    public DataCenterVnetVO take(long dcId, long accountId) {
-        SearchCriteria sc = FreeVnetSearch.create();
-        sc.setParameters("dc", dcId);
-        Date now = new Date();
-        Transaction txn = Transaction.currentTxn();
-        try {
-            txn.start();
-            DataCenterVnetVO vo = lock(sc, true);
-            if (vo == null) {
-                return null;
-            }
+	public List<DataCenterVnetVO> findVnet(long dcId, String vnet) {
+		SearchCriteria sc = VnetDcSearch.create();
+		;
+		sc.setParameters("dc", dcId);
+		sc.setParameters("vnet", vnet);
+		return listActiveBy(sc);
+	}
 
-            vo.setTakenAt(now);
-            vo.setAccountId(accountId);
-            update(vo.getId(), vo);
-            txn.commit();
-            return vo;
+	public void add(long dcId, int start, int end) {
+		String insertVnet = "INSERT INTO `cloud`.`op_dc_vnet_alloc` (vnet, data_center_id) VALUES ( ?, ?)";
 
-        } catch (Exception e) {
-            throw new CloudRuntimeException("Caught Exception ", e);
-        }
-    }
+		Transaction txn = Transaction.currentTxn();
+		try {
+			txn.start();
+			PreparedStatement stmt = txn.prepareAutoCloseStatement(insertVnet);
+			for (int i = start; i < end; i++) {
+				stmt.setString(1, String.valueOf(i));
+				stmt.setLong(2, dcId);
+				stmt.addBatch();
+			}
+			stmt.executeBatch();
+			txn.commit();
+		} catch (SQLException e) {
+			throw new CloudRuntimeException("Exception caught adding vnet ", e);
+		}
+	}
 
-    public void release(String vnet, long dcId, long accountId) {
-        SearchCriteria sc = VnetDcSearchAllocated.create();
-        sc.setParameters("vnet", vnet);
-        sc.setParameters("dc", dcId);
-        sc.setParameters("account", accountId);
+	public void delete(long dcId) {
+		String deleteVnet = "DELETE FROM `cloud`.`op_dc_vnet_alloc` WHERE data_center_id = ?";
 
-        DataCenterVnetVO vo = findOneBy(sc);
-        if (vo == null) {
-            return;
-        }
+		Transaction txn = Transaction.currentTxn();
+		try {
+			PreparedStatement stmt = txn.prepareAutoCloseStatement(deleteVnet);
+			stmt.setLong(1, dcId);
+			stmt.executeUpdate();
+		} catch (SQLException e) {
+			throw new CloudRuntimeException("Exception caught deleting vnet ",
+					e);
+		}
+	}
 
-        vo.setTakenAt(null);
-        vo.setAccountId(null);
-        update(vo.getId(), vo);
-    }
+	public DataCenterVnetVO take(long dcId, long accountId) {
+		SearchCriteria sc = FreeVnetSearch.create();
+		sc.setParameters("dc", dcId);
+		Date now = new Date();
+		Transaction txn = Transaction.currentTxn();
+		try {
+			txn.start();
+			List<DataCenterVnetVO> vos = this.lock(sc, new Filter(1, false), true);
+			if (vos.size() == 0) {
+				return null;
+			}
+			DataCenterVnetVO vo = vos.get(0);
 
-    protected DataCenterVnetDaoImpl() {
-    	super();
-        DcSearchAllocated = createSearchBuilder();
-        DcSearchAllocated.and("dc", DcSearchAllocated.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        DcSearchAllocated.and("allocated", DcSearchAllocated.entity().getTakenAt(), SearchCriteria.Op.NNULL);
-        DcSearchAllocated.done();
-        
-        FreeVnetSearch = createSearchBuilder();
-        FreeVnetSearch.and("dc", FreeVnetSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        FreeVnetSearch.and("taken", FreeVnetSearch.entity().getTakenAt(), SearchCriteria.Op.NULL);
-        FreeVnetSearch.done();
-        
-        VnetDcSearch = createSearchBuilder();
-        VnetDcSearch.and("vnet", VnetDcSearch.entity().getVnet(), SearchCriteria.Op.EQ);
-        VnetDcSearch.and("dc", VnetDcSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        VnetDcSearch.done();
+			vo.setTakenAt(now);
+			vo.setAccountId(accountId);
+			update(vo.getId(), vo);
+			txn.commit();
+			return vo;
 
-        VnetDcSearchAllocated = createSearchBuilder();
-        VnetDcSearchAllocated.and("vnet", VnetDcSearchAllocated.entity().getVnet(), SearchCriteria.Op.EQ);
-        VnetDcSearchAllocated.and("dc", VnetDcSearchAllocated.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        VnetDcSearchAllocated.and("taken", VnetDcSearchAllocated.entity().getTakenAt(), SearchCriteria.Op.NNULL);
-        VnetDcSearchAllocated.and("account", VnetDcSearchAllocated.entity().getAccountId(), SearchCriteria.Op.EQ);
-        VnetDcSearchAllocated.done();
-    }
+		} catch (Exception e) {
+			throw new CloudRuntimeException("Caught Exception ", e);
+		}
+	}
+
+	public void release(String vnet, long dcId, long accountId) {
+		SearchCriteria sc = VnetDcSearchAllocated.create();
+		sc.setParameters("vnet", vnet);
+		sc.setParameters("dc", dcId);
+		sc.setParameters("account", accountId);
+
+		DataCenterVnetVO vo = findOneBy(sc);
+		if (vo == null) {
+			return;
+		}
+
+		vo.setTakenAt(null);
+		vo.setAccountId(null);
+		update(vo.getId(), vo);
+	}
+
+	protected DataCenterVnetDaoImpl() {
+		super();
+		DcSearchAllocated = createSearchBuilder();
+		DcSearchAllocated.and("dc", DcSearchAllocated.entity()
+				.getDataCenterId(), SearchCriteria.Op.EQ);
+		DcSearchAllocated.and("allocated", DcSearchAllocated.entity()
+				.getTakenAt(), SearchCriteria.Op.NNULL);
+		DcSearchAllocated.done();
+
+		FreeVnetSearch = createSearchBuilder();
+		FreeVnetSearch.and("dc", FreeVnetSearch.entity().getDataCenterId(),
+				SearchCriteria.Op.EQ);
+		FreeVnetSearch.and("taken", FreeVnetSearch.entity().getTakenAt(),
+				SearchCriteria.Op.NULL);
+		FreeVnetSearch.done();
+
+		VnetDcSearch = createSearchBuilder();
+		VnetDcSearch.and("vnet", VnetDcSearch.entity().getVnet(),
+				SearchCriteria.Op.EQ);
+		VnetDcSearch.and("dc", VnetDcSearch.entity().getDataCenterId(),
+				SearchCriteria.Op.EQ);
+		VnetDcSearch.done();
+
+		VnetDcSearchAllocated = createSearchBuilder();
+		VnetDcSearchAllocated.and("vnet", VnetDcSearchAllocated.entity()
+				.getVnet(), SearchCriteria.Op.EQ);
+		VnetDcSearchAllocated.and("dc", VnetDcSearchAllocated.entity()
+				.getDataCenterId(), SearchCriteria.Op.EQ);
+		VnetDcSearchAllocated.and("taken", VnetDcSearchAllocated.entity()
+				.getTakenAt(), SearchCriteria.Op.NNULL);
+		VnetDcSearchAllocated.and("account", VnetDcSearchAllocated.entity()
+				.getAccountId(), SearchCriteria.Op.EQ);
+		VnetDcSearchAllocated.done();
+	}
 }
diff --git a/utils/src/com/cloud/utils/db/Filter.java b/utils/src/com/cloud/utils/db/Filter.java
index a8e421a2379..e3f78c29231 100755
--- a/utils/src/com/cloud/utils/db/Filter.java
+++ b/utils/src/com/cloud/utils/db/Filter.java
@@ -57,6 +57,10 @@ public class Filter {
         _orderBy = " ORDER BY RAND() LIMIT " + limit;
     }
     
+    public Filter(long limit, boolean random) {
+    	_orderBy = (random ? " ORDER BY RAND() " : "") + "LIMIT " + limit;  
+    }
+    
     /**
      * Note that this copy constructor does not copy offset and limit.
      * @param that filter