Skip to content

Commit 11020bc

Browse files
yuji-k64613garydgregory
authored andcommitted
Fixed a mistake in the FilenameUtils.concat()'s Javadoc about an absolute path. (#96)
* Fixed. /foo/a/ + ../bar --> /foo/bar
1 parent d463fa0 commit 11020bc

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ The <action> type attribute can be add,update,fix,remove.
134134
<action issue="IO-625" dev="ggregory" type="fix" due-to="Mikko Maunu">
135135
Corrected misleading exception message for FileUtils.copyDirectoryToDirectory.
136136
</action>
137+
<action issue="IO-626" dev="ggregory" type="fix" due-to="Yuji Konishi">
138+
A mistake in the FilenameUtils.concat()'s Javadoc about an absolute path.
139+
</action>
137140
</release>
138141

139142
<release version="2.6" date="2017-10-15" description="Java 7 required, Java 9 supported.">

src/main/java/org/apache/commons/io/FilenameUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ private static String doNormalize(final String fileName, final char separator, f
471471
* /foo + /bar --&gt; /bar
472472
* /foo + C:/bar --&gt; C:/bar
473473
* /foo + C:bar --&gt; C:bar (*)
474-
* /foo/a/ + ../bar --&gt; foo/bar
474+
* /foo/a/ + ../bar --&gt; /foo/bar
475475
* /foo/ + ../../bar --&gt; null
476476
* /foo/ + /bar --&gt; /bar
477477
* /foo/.. + /bar --&gt; /bar

0 commit comments

Comments
 (0)