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 2019/05/29 15:08:41 UTC

[sling-maven-plugin] branch master updated: eliminate null analysis warnings

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-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new b98293e  eliminate null analysis warnings
b98293e is described below

commit b98293e99fb076ba9623e51f010ae6c5e07cd656
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed May 29 17:08:31 2019 +0200

    eliminate null analysis warnings
---
 .../maven/bundlesupport/fsresource/SlingInitialContentMounter.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
index 2899966..c613cfc 100644
--- a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
+++ b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
@@ -115,7 +115,7 @@ public final class SlingInitialContentMounter {
                 if ( targetPath != null && !targetPath.endsWith("/") ) {
                     targetPath = targetPath + "/";
                 }
-                if ( targetPath != null && path.startsWith(targetPath) ) {
+                if ( targetPath != null && path != null && path.startsWith(targetPath) ) {
                     child = child.substring(targetPath.length());
                 }
                 dir = new File(rsrc.getDirectory(), child);