Author: hboutemy
Date: Sat Mar 19 21:54:35 2011
New Revision: 1083306
URL: http://svn.apache.org/viewvc?rev=1083306&view=rev
Log:
avoid NPE when no authenticationInfo (merged r1083303 from trunk)
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1083306&r1=1083305&r2=1083306&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Sat Mar 19 21:54:35 2011
@@ -325,7 +325,8 @@ public abstract class AbstractDeployMojo
throws MojoExecutionException
{
AuthenticationInfo authenticationInfo = manager.getAuthenticationInfo(
repository.getId() );
- log.debug( "authenticationInfo with id '" + repository.getId() + "': "
+ authenticationInfo.getUserName() );
+ log.debug( "authenticationInfo with id '" + repository.getId() + "': "
+ + ( ( authenticationInfo == null ) ? "-" :
authenticationInfo.getUserName() ) );
try
{