commit de724bae63db8267a410f8f753a796b61c44786d
author Stefan Seifert <stefanseifert@users.noreply.github.com> Tue Aug 24 23:38:27 2021 +0200
committer Stefan Seifert <stefanseifert@users.noreply.github.com> Tue Aug 24 23:38:27 2021 +0200
tree 4bcc370f5f0016a3cf40637925eb7e49b2973c85
parent d882431e9c47202b3b90bc1f9feafaf0f5e899c9

SLING-10752 fsresource: Fix NPE in FILEVAULT_XML mode when no filter file is given

src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java

diff --git a/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java b/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
index 3d29c31..db81cbb 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
@@ -154,17 +154,19 @@
      * @return Workspace filter or null if none found.
      */
     private WorkspaceFilter getWorkspaceFilter() {
-        if (filterXmlFile != null && filterXmlFile.exists()) {
-            try {
-                DefaultWorkspaceFilter workspaceFilter = new DefaultWorkspaceFilter();
-                workspaceFilter.load(filterXmlFile);
-                return workspaceFilter;
-            } catch (IOException | ConfigurationException ex) {
-                log.error("Unable to parse workspace filter: " + filterXmlFile.getPath(), ex);
+        if (filterXmlFile != null) {
+            if (filterXmlFile.exists()) {
+                try {
+                    DefaultWorkspaceFilter workspaceFilter = new DefaultWorkspaceFilter();
+                    workspaceFilter.load(filterXmlFile);
+                    return workspaceFilter;
+                } catch (IOException | ConfigurationException ex) {
+                    log.error("Unable to parse workspace filter: " + filterXmlFile.getPath(), ex);
+                }
             }
-        }
-        else {
-            log.debug("Workspace filter not found: " + filterXmlFile.getPath());
+            else {
+                log.debug("Workspace filter not found: {}", filterXmlFile.getPath());
+            }
         }
         return null;
     }