You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/06 16:52:32 UTC
[maven-filtering] branch MRESOURCES-275 created (now 7cbd412)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MRESOURCES-275
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git.
at 7cbd412 [MRESOURCES-275] Prevent NPE for empty resourceDirectory
This branch includes the following new commits:
new 7cbd412 [MRESOURCES-275] Prevent NPE for empty resourceDirectory
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-filtering] 01/01: [MRESOURCES-275] Prevent NPE for empty resourceDirectory
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOURCES-275
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 7cbd412b4101668567188992de7b9947af6cf237
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 6 17:52:21 2021 +0100
[MRESOURCES-275] Prevent NPE for empty resourceDirectory
---
.../maven/shared/filtering/DefaultMavenResourcesFiltering.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index 27b113f..9d0b579 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -184,17 +184,17 @@ public class DefaultMavenResourcesFiltering
String targetPath = resource.getTargetPath();
- File resourceDirectory = new File( resource.getDirectory() );
+ File resourceDirectory = ( resource.getDirectory() == null ) ? null : new File( resource.getDirectory() );
- if ( !resourceDirectory.isAbsolute() )
+ if ( resourceDirectory != null && !resourceDirectory.isAbsolute() )
{
resourceDirectory =
- new File( mavenResourcesExecution.getResourcesBaseDirectory(), resourceDirectory.getPath() );
+ new File( mavenResourcesExecution.getResourcesBaseDirectory(), resourceDirectory.getPath() );
}
- if ( !resourceDirectory.exists() )
+ if ( resourceDirectory == null || !resourceDirectory.exists() )
{
- getLogger().info( "skip non existing resourceDirectory " + resourceDirectory.getPath() );
+ getLogger().info( "skip non existing resourceDirectory " + resourceDirectory );
continue;
}