This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new a3b0786c89 Improve toString in case future versions of Java will change format a3b0786c89 is described below commit a3b0786c899de576996404284ac63ebdd510b969 Author: Igal Sapir <isa...@apache.org> AuthorDate: Sat May 13 12:23:54 2023 -0700 Improve toString in case future versions of Java will change format --- java/org/apache/catalina/util/NetMaskSet.java | 12 ++++++++++-- test/org/apache/catalina/util/TestNetMaskSet.java | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/util/NetMaskSet.java b/java/org/apache/catalina/util/NetMaskSet.java index 8aa330743c..dfaf23fc11 100644 --- a/java/org/apache/catalina/util/NetMaskSet.java +++ b/java/org/apache/catalina/util/NetMaskSet.java @@ -145,8 +145,16 @@ public class NetMaskSet { String result = netmasks.toString(); - // remove the open and close brackets - return result.substring(1, result.length() - 1); + // remove open and close brackets if exist + if (result.startsWith("[")) { + result = result.substring(1); + } + + if (result.endsWith("]")) { + result = result.substring(0, result.length() - 1); + } + + return result; } } diff --git a/test/org/apache/catalina/util/TestNetMaskSet.java b/test/org/apache/catalina/util/TestNetMaskSet.java index 513f417d03..f97538ce87 100644 --- a/test/org/apache/catalina/util/TestNetMaskSet.java +++ b/test/org/apache/catalina/util/TestNetMaskSet.java @@ -18,6 +18,8 @@ package org.apache.catalina.util; import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -46,5 +48,15 @@ public class TestNetMaskSet { Assert.assertTrue(nms.contains("10.20.30.40")); Assert.assertFalse(nms.contains("9.10.10.10")); Assert.assertFalse(nms.contains("11.10.10.10")); + + String s = nms.toString(); + Assert.assertTrue(s.indexOf('[') == -1); + Assert.assertTrue(s.indexOf(']') == -1); + + List<String> list = Arrays.asList(s.split("\\s*,\\s*")); + Assert.assertTrue(list.contains("192.168.0.0/24")); + Assert.assertTrue(list.contains("192.168.1.0/27")); + Assert.assertTrue(list.contains("192.168.2.2")); + Assert.assertTrue(list.contains("10.0.0.0/8")); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org