You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/08/24 21:38:43 UTC
[sling-org-apache-sling-fsresource] branch master updated:
SLING-10752 fsresource: Fix NPE in FILEVAULT_XML mode when no filter file
is given
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
The following commit(s) were added to refs/heads/master by this push:
new de724ba SLING-10752 fsresource: Fix NPE in FILEVAULT_XML mode when no filter file is given
de724ba is described below
commit de724bae63db8267a410f8f753a796b61c44786d
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Aug 24 23:38:27 2021 +0200
SLING-10752 fsresource: Fix NPE in FILEVAULT_XML mode when no filter file is given
---
.../internal/mapper/FileVaultResourceMapper.java | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
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 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
* @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;
}