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

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


The following commit(s) were added to refs/heads/master by this push:
     new fd75d5b6 [VFS-854] Avoid debug-logging URL credentials.
fd75d5b6 is described below

commit fd75d5b614e925412d0cbeda6ed703450076d65a
Author: Bernd Eckenfels <e...@apache.org>
AuthorDate: Tue May 28 18:35:50 2024 +0200

    [VFS-854] Avoid debug-logging URL credentials.
---
 .../main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java   | 2 +-
 .../java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java   | 2 +-
 src/changes/changes.xml                                              | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
index 31404641..ac0cea64 100644
--- 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
+++ 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
@@ -105,7 +105,7 @@ public class SoftRefFilesCache extends AbstractFilesCache {
      */
     private synchronized void close(final FileSystem fileSystem) {
         if (log.isDebugEnabled()) {
-            log.debug("Close FileSystem: " + fileSystem.getRootName());
+            log.debug("Close FileSystem: " + 
fileSystem.getRootName().getFriendlyURI());
         }
 
         fileSystemCache.remove(fileSystem);
diff --git 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
index 1d5fa41e..db054184 100644
--- 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
+++ 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
@@ -238,7 +238,7 @@ public class SftpFileSystem extends AbstractFileSystem {
             }
             return channel;
         } catch (final JSchException e) {
-            throw new FileSystemException("vfs.provider.sftp/connect.error", 
getRootName(), e);
+            throw new FileSystemException("vfs.provider.sftp/connect.error", 
getRootName().getFriendlyURI(), e);
         }
     }
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 79932deb..97ae2b74 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <release version="2.10.0" date="YYYY-MM-DD" description="Maintenance 
release. Requires Java 8 or above.">
       <!-- FIX -->
+      <action type="fix" issue="VFS-854" dev="ecki" due-to="Andrey Turbanov">
+        Avoid debug-logging URL credentials.
+      </action>
       <action type="fix" issue="VFS-853" dev="ecki" due-to="Bernd Eckenfels">
         Double wrapped weak FileListener can lose change notification with 
DelegateFileObject.
       </action>
@@ -370,7 +373,7 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     <release version="2.9.0" date="2021-06-16" description="Maintenance 
release. Requires Java 8 or above.">
       <!-- ADDS -->
-      <action type="fix" dev="ggregory" due-to="Gary Gregory">
+      <action type="add" dev="ggregory" due-to="Gary Gregory">
         Add and use FileOperationProvider.EMPTY_ARRAY.
       </action>      
       <!-- FIXES -->

Reply via email to