This is an automated email from the ASF dual-hosted git repository.
markt 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 f31be80570 Add a static parse() method for NetMaskSet
f31be80570 is described below
commit f31be80570c65272d6e248ef66a8204fb984ca4b
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Oct 1 12:58:40 2025 +0100
Add a static parse() method for NetMaskSet
---
java/org/apache/catalina/util/LocalStrings.properties | 2 ++
java/org/apache/catalina/util/NetMaskSet.java | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/java/org/apache/catalina/util/LocalStrings.properties
b/java/org/apache/catalina/util/LocalStrings.properties
index e7a3343d44..388e3c7298 100644
--- a/java/org/apache/catalina/util/LocalStrings.properties
+++ b/java/org/apache/catalina/util/LocalStrings.properties
@@ -39,6 +39,8 @@ netmask.cidrTooBig=The CIDR [{0}] is greater than the address
length [{1}]
netmask.invalidAddress=The address [{0}] is not valid
netmask.invalidPort=The port part in the pattern [{0}] is not valid
+netmaskSet.invalidNetMask=One or more netmasks provided are invalid: {0}
+
parameterMap.locked=No modifications are allowed to a locked ParameterMap
resourceSet.locked=No modifications are allowed to a locked ResourceSet
diff --git a/java/org/apache/catalina/util/NetMaskSet.java
b/java/org/apache/catalina/util/NetMaskSet.java
index 6365dc8f85..38f3abeb89 100644
--- a/java/org/apache/catalina/util/NetMaskSet.java
+++ b/java/org/apache/catalina/util/NetMaskSet.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.tomcat.util.res.StringManager;
/**
@@ -34,6 +35,8 @@ import org.apache.tomcat.util.buf.StringUtils;
*/
public class NetMaskSet {
+ private static final StringManager sm =
StringManager.getManager(NetMaskSet.class);
+
private final Set<NetMask> netmasks = new HashSet<>();
/**
@@ -159,4 +162,19 @@ public class NetMaskSet {
return result;
}
+
+ public static NetMaskSet parse(String input) {
+ NetMaskSet result = new NetMaskSet();
+
+ List<String> errors = result.addAll(input);
+ if (!errors.isEmpty()) {
+ StringBuilder sb = new StringBuilder();
+ for (String error : errors) {
+ sb.append(error).append("; ");
+ }
+ throw new
IllegalArgumentException(sm.getString("netmaskSet.invalidNetMask",
sb.toString()));
+ }
+
+ return result;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
