Fix test failures due to incorrect validation

huyfaeng · Jun 21, 2014 · 3ad96d6 · 3ad96d6
1 parent 365b3f5
commit 3ad96d6
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
@@ -334,32 +334,37 @@ private static int portStringToInt(String value) {
      * @throws HAProxyProtocolException  if the address is invalid
      */
     private static void checkAddress(String address, AddressFamily addrFamily) {
-        if (address == null) {
-            throw new NullPointerException("address");
-        }
-
         if (addrFamily == null) {
             throw new NullPointerException("addrFamily");
         }
 
-        if (addrFamily == AddressFamily.AF_UNSPEC) {
-            throw new HAProxyProtocolException("unable to validate an AF_UNSPEC address: " + address);
-        }
-
-        if (addrFamily == AddressFamily.AF_UNIX) {
-            return;
+        switch (addrFamily) {
+            case AF_UNSPEC:
+                if (address != null) {
+                    throw new HAProxyProtocolException("unable to validate an AF_UNSPEC address: " + address);
+                }
+                return;
+            case AF_UNIX:
+                return;
         }
 
-        boolean isValid = true;
-
-        if (addrFamily == AddressFamily.AF_IPv4) {
-            isValid = NetUtil.isValidIpV4Address(address);
-        } else if (addrFamily == AddressFamily.AF_IPv6) {
-            isValid = NetUtil.isValidIpV6Address(address);
+        if (address == null) {
+            throw new NullPointerException("address");
         }
 
-        if (!isValid) {
-            throw new HAProxyProtocolException("invalid " + addrFamily + " address: " + address);
+        switch (addrFamily) {
+            case AF_IPv4:
+                if (!NetUtil.isValidIpV4Address(address)) {
+                    throw new HAProxyProtocolException("invalid IPv4 address: " + address);
+                }
+                break;
+            case AF_IPv6:
+                if (!NetUtil.isValidIpV6Address(address)) {
+                    throw new HAProxyProtocolException("invalid IPv6 address: " + address);
+                }
+                break;
+            default:
+                throw new Error();
         }
     }