codeboyInGitHub
diff --git a/‎utils/src/com/cloud/utils/net/NetUtils.java‎
Lines changed: 6 additions & 0 deletions b/‎utils/src/com/cloud/utils/net/NetUtils.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎utils/test/com/cloud/utils/net/NetUtilsTest.java‎
Lines changed: 1 addition & 0 deletions b/‎utils/test/com/cloud/utils/net/NetUtilsTest.java‎
Lines changed: 1 addition & 0 deletions
@@ -1406,6 +1406,12 @@ public static boolean isSameIsolationId(String one, String other)
         {
             return true;
         }
+        if ((one == null || other == null)
+                &&
+                !(one == null && other == null))
+        {
+            return false;
+        }
         // check 'untagged'
         if (VLAN_UNTAGGED.equalsIgnoreCase(one) && VLAN_UNTAGGED.equalsIgnoreCase(other))
         {
 
@@ -178,5 +178,6 @@ public void testGetLocalIPString() {
     public void testSameIsolationId() {
         assertTrue(NetUtils.isSameIsolationId("1", "vlan://1"));
         assertTrue(NetUtils.isSameIsolationId("", null));
+        assertFalse(NetUtils.isSameIsolationId("bla", null));
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -1406,6 +1406,12 @@ public static boolean isSameIsolationId(String one, String other)`
`1406`	`1406`	`{`
`1407`	`1407`	`return true;`
`1408`	`1408`	`}`
	`1409`	`+ if ((one == null \|\| other == null)`
	`1410`	`+ &&`
	`1411`	`+ !(one == null && other == null))`
	`1412`	`+ {`
	`1413`	`+ return false;`
	`1414`	`+ }`
`1409`	`1415`	`// check 'untagged'`
`1410`	`1416`	`if (VLAN_UNTAGGED.equalsIgnoreCase(one) && VLAN_UNTAGGED.equalsIgnoreCase(other))`
`1411`	`1417`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,5 +178,6 @@ public void testGetLocalIPString() {`
`178`	`178`	`public void testSameIsolationId() {`
`179`	`179`	`assertTrue(NetUtils.isSameIsolationId("1", "vlan://1"));`
`180`	`180`	`assertTrue(NetUtils.isSameIsolationId("", null));`
	`181`	`+ assertFalse(NetUtils.isSameIsolationId("bla", null));`
`181`	`182`	`}`
`182`	`183`	`}`