From 22a850828001b89fd6ac8e3916256bc7e966a1ef Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Fri, 7 Jun 2013 19:22:39 +0530
Subject: [PATCH] CLOUDSTACK-2894. Removing all vlan ranges should update the
 vnet column to NULL.

---
 .../com/cloud/network/NetworkServiceImpl.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index c2af8e8fe60..c7be2c62cf1 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2680,9 +2680,10 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService {
                         vnetString = vnetString+vnetRange.first().toString()+"-"+value.toString()+";";
                     }
                }
-                vnetString = vnetString+"*";
-                vnetString = vnetString.replace(";*","");
-                network.setVnet(vnetString);
+               if (vnetString.length() > 0 && vnetString.charAt(vnetString.length()-1)==';') {
+                   vnetString = vnetString.substring(0, vnetString.length()-1);
+               }
+               network.setVnet(vnetString);
             }
 
             for (Pair<Integer, Integer> vnetToAdd : vnetsToAdd) {
@@ -2788,12 +2789,15 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService {
         _datacneter_vnet.deleteRange(txn, network.getDataCenterId(), network.getId(), start, end);
 
         String vnetString="";
-        for (Pair<Integer,Integer> vnetRange : existingRanges ){
-            vnetString=vnetString+vnetRange.first().toString()+"-"+vnetRange.second().toString()+";";
+        if (existingRanges.isEmpty()) {
+            network.setVnet(null);
+        } else {
+            for (Pair<Integer,Integer> vnetRange : existingRanges ) {
+                vnetString=vnetString+vnetRange.first().toString()+"-"+vnetRange.second().toString()+";";
+            }
+            vnetString = vnetString.substring(0, vnetString.length()-1);
+            network.setVnet(vnetString);
         }
-        vnetString = vnetString+"*";
-        vnetString = vnetString.replace(";*","");
-        network.setVnet(vnetString);
         _physicalNetworkDao.update(network.getId(), network);
         txn.commit();
         _physicalNetworkDao.releaseFromLockTable(network.getId());