From a9aab2798a3a5811e39d3d1806ae1f0be1869669 Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 15 Apr 2003 17:10:37 +0000 Subject: [PATCH] Made IPv6 address parsing a bit sleeker --- src/helma/util/InetAddressFilter.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/helma/util/InetAddressFilter.java b/src/helma/util/InetAddressFilter.java index 1cdad82a..1bbc2138 100644 --- a/src/helma/util/InetAddressFilter.java +++ b/src/helma/util/InetAddressFilter.java @@ -71,12 +71,10 @@ public class InetAddressFilter { pattern[i*2] = pattern[i*2+1] = 256; } else if (next.length() == 0) { pattern[i*2] = pattern[i*2+1] = 0; - } else if (next.length() <= 2) { - pattern[i*2] = 0; - pattern[i*2+1] = (byte) Integer.parseInt(next, 16); } else { - pattern[i*2] = (byte) Integer.parseInt(next.substring(0,2), 16); - pattern[i*2+1] = (byte) Integer.parseInt(next.substring(2), 16); + int n = Integer.parseInt(next, 16); + pattern[i*2] = (byte) ((n & 0xff00) >> 8); + pattern[i*2+1] = (byte) (n & 0xff); } } else { if ("*".equals(next)) { @@ -86,7 +84,6 @@ public class InetAddressFilter { } } } - patterns.addElement(pattern); }