[commons-io] branch master updated: Fixed a mistake in the FilenameUtils.concat()'s Javadoc about an absolute path. (#96)

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


The following commit(s) were added to refs/heads/master by this push:
     new 11020bc  Fixed a mistake in the FilenameUtils.concat()'s Javadoc about an absolute path. (#96)
11020bc is described below

commit 11020bc315edd3d7549482382445b8031b5743de
Author: Yuji Konishi <yu...@gmail.com>
AuthorDate: Wed Sep 11 21:52:18 2019 +0900

    Fixed a mistake in the FilenameUtils.concat()'s Javadoc about an absolute path. (#96)
    
    * Fixed.
    /foo/a/ + ../bar     -->   /foo/bar
---
 src/changes/changes.xml                                | 3 +++
 src/main/java/org/apache/commons/io/FilenameUtils.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cb053d5..1160760 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -134,6 +134,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="IO-625" dev="ggregory" type="fix" due-to="Mikko Maunu">
         Corrected misleading exception message for FileUtils.copyDirectoryToDirectory.
       </action>
+      <action issue="IO-626" dev="ggregory" type="fix" due-to="Yuji Konishi">
+        A mistake in the FilenameUtils.concat()'s Javadoc about an absolute path.
+      </action>
     </release>
 
     <release version="2.6" date="2017-10-15" description="Java 7 required, Java 9 supported.">
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java
index abc65ef..51cc9ee 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -471,7 +471,7 @@ public class FilenameUtils {
      * /foo + /bar          --&gt;   /bar
      * /foo + C:/bar        --&gt;   C:/bar
      * /foo + C:bar         --&gt;   C:bar (*)
-     * /foo/a/ + ../bar     --&gt;   foo/bar
+     * /foo/a/ + ../bar     --&gt;   /foo/bar
      * /foo/ + ../../bar    --&gt;   null
      * /foo/ + /bar         --&gt;   /bar
      * /foo/.. + /bar       --&gt;   /bar