Repository: mina Updated Branches: refs/heads/2.0 08110c5e9 -> c915d1f6f
Fixed a wrong test that was forbidding the use of IPV6 adresses Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/c915d1f6 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/c915d1f6 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/c915d1f6 Branch: refs/heads/2.0 Commit: c915d1f6fbb9809b90366405b501e9f8842e32d7 Parents: 08110c5 Author: Emmanuel Lécharny <[email protected]> Authored: Fri Sep 26 06:44:34 2014 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Fri Sep 26 06:44:34 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/mina/filter/firewall/Subnet.java | 5 +++-- .../org/apache/mina/filter/firewall/SubnetIPv6Test.java | 9 +-------- 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/c915d1f6/mina-core/src/main/java/org/apache/mina/filter/firewall/Subnet.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/filter/firewall/Subnet.java b/mina-core/src/main/java/org/apache/mina/filter/firewall/Subnet.java index 08ea46e..bbf933f 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/firewall/Subnet.java +++ b/mina-core/src/main/java/org/apache/mina/filter/firewall/Subnet.java @@ -21,6 +21,7 @@ package org.apache.mina.filter.firewall; import java.net.Inet4Address; +import java.net.Inet6Address; import java.net.InetAddress; /** @@ -61,8 +62,8 @@ public class Subnet { throw new IllegalArgumentException("Subnet address can not be null"); } - if (!(subnet instanceof Inet4Address)) { - throw new IllegalArgumentException("Only IPv4 supported"); + if (!(subnet instanceof Inet4Address) && !(subnet instanceof Inet6Address)) { + throw new IllegalArgumentException("Only IPv4 and IPV6 supported"); } if (subnet instanceof Inet4Address) { http://git-wip-us.apache.org/repos/asf/mina/blob/c915d1f6/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv6Test.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv6Test.java b/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv6Test.java index 094195a..5d06601 100644 --- a/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv6Test.java +++ b/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv6Test.java @@ -21,7 +21,6 @@ package org.apache.mina.filter.firewall; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.net.Inet6Address; import java.net.InetAddress; @@ -45,12 +44,6 @@ public class SubnetIPv6Test { assertTrue(a instanceof Inet6Address); - try { - new Subnet(a, 24); - fail("IPv6 not supported"); - } catch (IllegalArgumentException e) { - // signifies a successful test execution - assertTrue(true); - } + new Subnet(a, 24); } }
