You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/11/20 16:12:40 UTC
svn commit: r1847024 - in /commons/proper/vfs/trunk:
commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
src/changes/changes.xml
Author: ggregory
Date: Tue Nov 20 16:12:40 2018
New Revision: 1847024
URL: http://svn.apache.org/viewvc?rev=1847024&view=rev
Log:
[VFS-682] Throw a org.apache.commons.vfs2.FileSystemException instead of a NullPointerException in org.apache.commons.vfs2.impl.DefaultFileSystemManager.resolveName(FileName, String, NameScope).
Modified:
commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified: commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java?rev=1847024&r1=1847023&r2=1847024&view=diff
==============================================================================
--- commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java (original)
+++ commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java Tue Nov 20 16:12:40 2018
@@ -762,7 +762,10 @@ public class DefaultFileSystemManager im
public FileName resolveName(final FileName base, final String name, final NameScope scope)
throws FileSystemException {
if (base == null) {
- throw new FileSystemException("Invalid base filename.");
+ throw new FileSystemException("Invalid base FileName.");
+ }
+ if (name == null) {
+ throw new FileSystemException("Invalid name String.");
}
final FileName realBase;
if (VFS.isUriStyle() && base.isFile()) {
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1847024&r1=1847023&r2=1847024&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Tue Nov 20 16:12:40 2018
@@ -104,6 +104,9 @@ The <action> type attribute can be add,u
<action issue="VFS-674" dev="ggregory" type="fix" due-to="Boris Petrov, Gary Gregory">
Cannot close an FTP input stream without an exception.
</action>
+ <action issue="VFS-682" dev="ggregory" type="update">
+ Throw a org.apache.commons.vfs2.FileSystemException instead of a NullPointerException in org.apache.commons.vfs2.impl.DefaultFileSystemManager.resolveName(FileName, String, NameScope).
+ </action>
</release>
<release version="2.2" date="2017-10-06" description="New features and bug fix release.">
<action issue="VFS-642" dev="pschumacher" type="update" due-to="ilangoldfeld">