From 62c9343658cec3ec36d326e7a03e0107e3e87bd3 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Mon, 6 Jan 2014 11:28:50 +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 905e518e956..becca37d12f 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1398,6 +1398,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 6d145938280..600b69ee5b2 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -182,5 +182,6 @@ public class NetUtilsTest extends TestCase {
         assertTrue(NetUtils.isSameIsolationId("UnTagged", "vlan://uNtAGGED"));
         assertFalse(NetUtils.isSameIsolationId("2", "vlan://uNtAGGED"));
         assertFalse(NetUtils.isSameIsolationId("2", "vlan://3"));
+        assertFalse(NetUtils.isSameIsolationId("bla", null));
     }
 }