Query strings once

apache · Sep 19, 2024 · c5e6970 · c5e6970
1 parent 4955aa6
commit c5e6970
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -159,16 +159,19 @@ public boolean isValidInet6Address(String inet6Address) {
         if (containsCompressedZeroes && inet6Address.indexOf("::") != inet6Address.lastIndexOf("::")) {
             return false;
         }
-        if (inet6Address.startsWith(":") && !inet6Address.startsWith("::") || inet6Address.endsWith(":") && !inet6Address.endsWith("::")) {
+        final boolean startsWithCompressed = inet6Address.startsWith("::");
+        final boolean endsWithCompressed = inet6Address.endsWith("::");
+        final boolean endsWithSep = inet6Address.endsWith(":");
+        if (inet6Address.startsWith(":") && !startsWithCompressed || endsWithSep && !endsWithCompressed) {
             return false;
         }
         String[] octets = inet6Address.split(":");
         if (containsCompressedZeroes) {
             final List<String> octetList = new ArrayList<>(Arrays.asList(octets));
-            if (inet6Address.endsWith("::")) {
+            if (endsWithCompressed) {
                 // String.split() drops ending empty segments
                 octetList.add("");
-            } else if (inet6Address.startsWith("::") && !octetList.isEmpty()) {
+            } else if (startsWithCompressed && !octetList.isEmpty()) {
                 octetList.remove(0);
             }
             octets = octetList.toArray(new String[0]);