Merge branch 'master' of https://github.com/AgNO3/jcifs-ng

cosote · Aug 5, 2018 · 5ee4d68 · 5ee4d68
2 parents c55336d + 5825cc6
commit 5ee4d68
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/jcifs/smb/SmbFile.java b/src/main/java/jcifs/smb/SmbFile.java
@@ -940,7 +940,7 @@ public String getCanonicalUncPath () {
     public String getDfsPath () throws SmbException {
         try {
             String path = this.treeConnection.ensureDFSResolved(this.fileLocator).getDfsPath();
-            if ( isDirectory() ) {
+            if ( path != null && isDirectory() ) {
                 path += '/';
             }
             return path;