You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/03/13 18:20:29 UTC
svn commit: r753320 - in
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability:
MojoExecutionExceptionDiagnoser.java MojoFailureExceptionDiagnoser.java
Author: jdcasey
Date: Fri Mar 13 17:20:19 2009
New Revision: 753320
URL: http://svn.apache.org/viewvc?rev=753320&view=rev
Log:
[MNG-4079] Fixed and tested this time.
Modified:
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
Modified: maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java?rev=753320&r1=753319&r2=753320&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java (original)
+++ maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java Fri Mar 13 17:20:19 2009
@@ -48,11 +48,14 @@
String shortMessage = mee.getMessage();
if ( shortMessage != null )
{
- message.append( mee.getMessage() );
+ message.append( shortMessage );
}
String longMessage = mee.getLongMessage();
- if ( longMessage != null && !longMessage.equals( shortMessage ) )
+
+ // the indexOf bit is very strange, but the compiler output for 1.5 source compiled using JDK 1.4 presents this case!
+ // duplicating here for consistency, just in case there's another goofy plugin output I don't know of.
+ if ( longMessage != null && !longMessage.equals( shortMessage ) && shortMessage.indexOf( longMessage ) < 0 )
{
message.append( "\n\n" ).append( longMessage );
}
Modified: maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java?rev=753320&r1=753319&r2=753320&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java (original)
+++ maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java Fri Mar 13 17:20:19 2009
@@ -48,11 +48,13 @@
String shortMessage = mfe.getMessage();
if ( shortMessage != null )
{
- message.append( mfe.getMessage() );
+ message.append( shortMessage );
}
String longMessage = mfe.getLongMessage();
- if ( longMessage != null && !longMessage.equals( shortMessage ) )
+
+ // the indexOf bit is very strange, but the compiler output for 1.5 source compiled using JDK 1.4 presents this case!
+ if ( longMessage != null && !longMessage.equals( shortMessage ) && shortMessage.indexOf( longMessage ) < 0 )
{
message.append( "\n\n" ).append( longMessage );
}