You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/07/23 21:47:18 UTC
svn commit: r679172 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Author: bentmann
Date: Wed Jul 23 12:47:18 2008
New Revision: 679172
URL: http://svn.apache.org/viewvc?rev=679172&view=rev
Log:
[MRELEASE-364] InvokerMavenExecutor fails with NPE if additional arguments are not set
Submitted by: Steve Gilbert
Reviewed by: Benjamin Bentmann
o Applied with improved formatting
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=679172&r1=679171&r2=679172&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Wed Jul 23 12:47:18 2008
@@ -154,7 +154,15 @@
String additionalArguments )
throws MavenExecutorException
{
- String[] args = additionalArguments.split( " " );
+ String[] args;
+ if ( additionalArguments == null )
+ {
+ args = new String[0];
+ }
+ else
+ {
+ args = additionalArguments.split( " " );
+ }
try
{
CommandLine cli = new PosixParser().parse( OPTIONS, args );
@@ -185,7 +193,7 @@
{
req.setDebug( true );
}
- else if ( cli.hasOption( ERRORS ) )
+ else if ( cli.hasOption( ERRORS ) )
{
req.setShowErrors( true );
}
@@ -212,7 +220,7 @@
if ( profiles != null )
{
- for ( int i=0; i < profiles.length; ++i )
+ for ( int i = 0; i < profiles.length; ++i )
{
StringTokenizer profileTokens = new StringTokenizer( profiles[i], "," );
@@ -238,7 +246,10 @@
if ( !deactivatedProfiles.isEmpty() )
{
- getLogger().warn( "Explicit profile deactivation is not yet supported. The following profiles will NOT be deactivated: " + StringUtils.join( deactivatedProfiles.iterator(), ", " ) );
+ getLogger().warn(
+ "Explicit profile deactivation is not yet supported. "
+ + "The following profiles will NOT be deactivated: "
+ + StringUtils.join( deactivatedProfiles.iterator(), ", " ) );
}
if ( !activatedProfiles.isEmpty() )