lastIndex*O*f

diffblue · Oct 14, 2024 · 2540910 · 2540910
1 parent 7c6c127
commit 2540910
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/WHATSNEW b/WHATSNEW
@@ -1,7 +1,11 @@
 Changes from Ant 1.10.15 TO Ant 1.10.16
 =======================================
 
+Fixed bugs:
+-----------
 
+ * <scp> now properly handles IPv6 addresses as hostnames.
+   Bugzilla Report 59160
 
 Changes from Ant 1.10.14 TO Ant 1.10.15
 =======================================

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -435,8 +435,9 @@ private String parseUri(final String uri) {
             throw new BuildException("no username was given.  Can't authenticate.");
         }
 
-        // For IPv6 address having more than one ":", it should look for the last occurrence
-        final int indexOfPath = uri.lastIndexof(':');
+        // For IPv6 addresses, the host part may contain more than one ":",
+        // look for the last occurrence
+        final int indexOfPath = uri.lastIndexOf(':');
         if (indexOfPath <= indexOfAt) {
             throw new BuildException("no remote path in %s", uri);
         }