From 7e195ae6aeaa5fb532555bd989cad2426d00eee6 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Mon, 27 Jun 2011 16:08:30 -0400
Subject: [PATCH] bug 10440: ipassoca failed, if the public network is untagged
 status 10440: resolved fixed

---
 .../resource/computing/LibvirtComputingResource.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index f13096ebb9e..992d56f21ff 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -1008,11 +1008,17 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         OutputInterpreter.OneLineParser vlanIdParser = new  OutputInterpreter.OneLineParser();
         final Script cmd = new Script("/bin/bash", s_logger);
         cmd.add("-c");
-        cmd.add("vlanid=$(brctl show |grep " + brName + " |awk '{print $4}' | cut -d. -f 2);echo $vlanid");
-        if (cmd.execute(vlanIdParser) != null) {
+        cmd.add("vlanid=$(brctl show |grep " + brName + " |awk '{print $4}' | cut -s -d. -f 2);echo $vlanid");
+        String result = cmd.execute(vlanIdParser);
+        if (result != null) {
             return null;
         }
-        return vlanIdParser.getLine();
+        String vlanId = vlanIdParser.getLine();
+        if (vlanId.equalsIgnoreCase("")) {
+            return null;
+        } else {
+            return vlanId;
+        }
     }
     
     private void VifHotPlug(Connect conn, String vmName, String vlanId, String macAddr) throws InternalErrorException, LibvirtException {