You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/09/25 13:56:29 UTC
[maven-ear-plugin] 01/01: check return value from mkdirs
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch ear-285
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit 6908415eff4d1277647511b5a8af5d4f8fc184bf
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Sep 25 09:54:56 2020 -0400
check return value from mkdirs
---
src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 10 +++++++---
.../apache/maven/plugins/ear/GenerateApplicationXmlMojo.java | 12 +++++++++---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index cd0007e..66689f5 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -453,7 +453,10 @@ public class EarMojo
{
getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "] (unpacked)" );
// Make sure that the destination is a directory to avoid plexus nasty stuff :)
- destinationFile.mkdirs();
+ if ( !destinationFile.mkdirs() )
+ {
+ throw new MojoExecutionException( "Error creating " + destinationFile );
+ }
unpack( sourceFile, destinationFile, outdatedResources );
if ( skinnyWars && module.changeManifestClasspath() )
@@ -695,9 +698,10 @@ public class EarMojo
if ( filtering && !isNonFilteredExtension( source.getName() ) )
{
// Silly that we have to do this ourselves
- if ( target.getParentFile() != null && !target.getParentFile().exists() )
+ File parentDirectory = target.getParentFile();
+ if ( parentDirectory != null && !parentDirectory.exists() )
{
- target.getParentFile().mkdirs();
+ Files.createDirectories( parentDirectory.toPath() );
}
mavenFileFilter.copyFile( source, target, true, getFilterWrappers(), encoding );
diff --git a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
index e39a88e..db14956 100644
--- a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
@@ -238,7 +238,10 @@ public class GenerateApplicationXmlMojo
File outputDir = new File( generatedDescriptorLocation );
if ( !outputDir.exists() )
{
- outputDir.mkdirs();
+ if ( !outputDir.mkdirs() )
+ {
+ throw new EarPluginException( "Error creating " + outputDir );
+ }
}
File descriptor = new File( outputDir, "application.xml" );
@@ -253,7 +256,7 @@ public class GenerateApplicationXmlMojo
}
/**
- * Generates the jboss deployment descriptor.
+ * Generates the JBoss deployment descriptor.
*
* @throws EarPluginException if the configuration is invalid
*/
@@ -263,7 +266,10 @@ public class GenerateApplicationXmlMojo
File outputDir = new File( generatedDescriptorLocation );
if ( !outputDir.exists() )
{
- outputDir.mkdirs();
+ if ( !outputDir.mkdirs() )
+ {
+ throw new EarPluginException( "Error creating " + outputDir );
+ }
}
File descriptor = new File( outputDir, "jboss-app.xml" );