This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/master by this push:
new 1e88504 SLING-12383: ResourceResolver: potential NPE while processing
aliases (#118)
1e88504 is described below
commit 1e8850451be2dce0a9614ce06e42a002b17814d7
Author: Julian Reschke <[email protected]>
AuthorDate: Wed Jul 17 15:46:17 2024 +0200
SLING-12383: ResourceResolver: potential NPE while processing aliases (#118)
* SLING-12383: ResourceResolver: potential NPE while processing aliases
* SLING-12383: ResourceResolver: potential NPE while processing aliases -
move null check up
* SLING-12383: ResourceResolver: potential NPE while processing aliases -
improve diagnostics in log message
* SLING-12383: ResourceResolver: potential NPE while processing aliases -
improve diagnostics in log message
---
.../org/apache/sling/resourceresolver/impl/mapping/MapEntries.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index ee62ea1..168faeb 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -1220,6 +1220,10 @@ public class MapEntries implements
if (JCR_CONTENT.equals(resource.getName())) {
containingResource = resource.getParent();
+ if (containingResource == null) {
+ log.warn("containingResource is null for alias on {},
skipping.", resource.getPath());
+ return false;
+ }
} else {
containingResource = resource;
}
@@ -1227,7 +1231,8 @@ public class MapEntries implements
final Resource parent = containingResource.getParent();
if (parent == null) {
- log.debug("parent is null for alias on {}.", resource.getName());
+ log.warn("{} is null for alias on {}, skipping.",
containingResource == resource ? "parent" : "grandparent",
+ resource.getPath());
return false;
}
else {
