Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNG-6626] fix DefaultExceptionHandler NPE #241

Closed
wants to merge 1 commit into from
Closed

[MNG-6626] fix DefaultExceptionHandler NPE #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,13 @@ else if ( exception instanceof PluginExecutionException )
{
Throwable cause2 = cause.getCause();

if ( cause2 instanceof NoClassDefFoundError
&& cause2.getMessage().contains( "org/sonatype/aether/" ) )
if ( cause2 instanceof NoClassDefFoundError )
{
reference = "AetherClassNotFound";
String message = cause2.getMessage();
if ( message != null && message.contains( "org/sonatype/aether/" ) )
{
reference = "AetherClassNotFound";
}
}
}

Expand Down
53 changes: 49 additions & 4 deletions maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,22 @@
import java.io.IOException;
import java.net.ConnectException;

import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;

import junit.framework.TestCase;
import org.apache.maven.plugin.PluginContainerException;
import org.apache.maven.plugin.PluginExecutionException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.junit.Test;

import static org.junit.Assert.assertEquals;

/**
* @author <a href="mailto:[email protected]">Barrie Treloar</a>
*/
public class DefaultExceptionHandlerTest
extends TestCase
{
/**
* Running Maven under JDK7 may cause connection issues because IPv6 is used by default.
Expand All @@ -42,11 +49,11 @@ public class DefaultExceptionHandlerTest
* http://cwiki.apache.org/confluence/display/MAVEN/ConnectException
* </p>
*/
@Test
public void testJdk7ipv6()
{
ConnectException connEx = new ConnectException( "Connection refused: connect" );
IOException ioEx = new IOException( "Unable to establish loopback connection" );
ioEx.initCause( connEx );
IOException ioEx = new IOException( "Unable to establish loopback connection", connEx );
MojoExecutionException mojoEx =
new MojoExecutionException( "Error executing Jetty: Unable to establish loopback connection", ioEx );

Expand All @@ -57,4 +64,42 @@ public void testJdk7ipv6()
assertEquals( expectedReference, exceptionSummary.getReference() );

}

@Test
public void testHandleExceptionAetherClassNotFound()
{
Throwable cause2 = new NoClassDefFoundError( "org/sonatype/aether/RepositorySystem" );
Plugin plugin = new Plugin();
Exception cause = new PluginContainerException( plugin, null, null, cause2 );
PluginDescriptor pluginDescriptor = new PluginDescriptor();
MojoDescriptor mojoDescriptor = new MojoDescriptor();
mojoDescriptor.setPluginDescriptor( pluginDescriptor );
MojoExecution mojoExecution = new MojoExecution(mojoDescriptor);
Throwable exception = new PluginExecutionException( mojoExecution, null, cause );

DefaultExceptionHandler handler = new DefaultExceptionHandler();
ExceptionSummary summary = handler.handleException( exception );

String expectedReference = "http://cwiki.apache.org/confluence/display/MAVEN/AetherClassNotFound";
assertEquals( expectedReference, summary.getReference() );
}

@Test
public void testHandleExceptionNoClassDefFoundErrorNull()
{
Throwable cause2 = new NoClassDefFoundError();
Plugin plugin = new Plugin();
Exception cause = new PluginContainerException( plugin, null, null, cause2 );
PluginDescriptor pluginDescriptor = new PluginDescriptor();
MojoDescriptor mojoDescriptor = new MojoDescriptor();
mojoDescriptor.setPluginDescriptor( pluginDescriptor );
MojoExecution mojoExecution = new MojoExecution(mojoDescriptor);
Throwable exception = new PluginExecutionException( mojoExecution, null, cause );

DefaultExceptionHandler handler = new DefaultExceptionHandler();
ExceptionSummary summary = handler.handleException( exception );

String expectedReference = "http://cwiki.apache.org/confluence/display/MAVEN/PluginContainerException";
assertEquals( expectedReference, summary.getReference() );
}
}