From 638da54fcee53cea305c0e730fef28c914298731 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Tue, 18 Nov 2014 12:12:00 +0100
Subject: [PATCH] CID-1254833 refactor condition to include null-case

---
 utils/src/com/cloud/utils/net/NetUtils.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index 0eda3f87283..b092c945b14 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1317,11 +1317,8 @@ public class NetUtils {
         BigInteger startInt = convertIPv6AddressToBigInteger(start);
         BigInteger endInt = convertIPv6AddressToBigInteger(end);
         if (endInt != null) {
-            if (startInt != null)
-            {
-                if(startInt.compareTo(endInt) > 0) {
-                    return null;
-                }
+            if (startInt == null || startInt.compareTo(endInt) > 0) {
+                return null;
             }
             return endInt.subtract(startInt).add(BigInteger.ONE);
         }