Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed a mistake in the FilenameUtils.concat()'s Javadoc about an absolute path. #96

Merged
merged 3 commits into from Sep 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/changes/changes.xml
Expand Up @@ -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.">
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/io/FilenameUtils.java
Expand Up @@ -471,7 +471,7 @@ private static String doNormalize(final String fileName, final char separator, f
* /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
Expand Down