From 61d48154fd4613c0f19210cd69d752bf6abe0cab Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Thu, 2 Jan 2014 21:24:32 +0100
Subject: [PATCH] compare null to non-null or not-empty-string

---
 utils/src/com/cloud/utils/net/NetUtils.java      | 6 ++++++
 utils/test/com/cloud/utils/net/NetUtilsTest.java | 1 +
 2 files changed, 7 insertions(+)

diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index 1903b290f03..266a5d1d0cf 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1406,6 +1406,12 @@ public class NetUtils {
         {
             return true;
         }
+        if ((one == null || other == null)
+                &&
+                !(one == null && other == null))
+        {
+            return false;
+        }
         // check 'untagged'
         if (VLAN_UNTAGGED.equalsIgnoreCase(one) && VLAN_UNTAGGED.equalsIgnoreCase(other))
         {
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index 45a9334609f..b049516abbd 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -178,5 +178,6 @@ public class NetUtilsTest extends TestCase {
     public void testSameIsolationId() {
         assertTrue(NetUtils.isSameIsolationId("1", "vlan://1"));
         assertTrue(NetUtils.isSameIsolationId("", null));
+        assertFalse(NetUtils.isSameIsolationId("bla", null));
     }
 }