You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by br...@apache.org on 2005/10/18 23:16:25 UTC

svn commit: r326250 - /maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java

Author: brett
Date: Tue Oct 18 14:16:22 2005
New Revision: 326250

URL: http://svn.apache.org/viewcvs?rev=326250&view=rev
Log:
merge from tag maven-2.0, rev 326248

Modified:
    maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java

Modified: maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java?rev=326250&r1=326249&r2=326250&view=diff
==============================================================================
--- maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java (original)
+++ maven/components/trunk/maven-error-diagnostics/src/main/java/org/apache/maven/usability/diagnostics/DiagnosisUtils.java Tue Oct 18 14:16:22 2005
@@ -86,7 +86,7 @@
         {
             String rootMsg = root.getMessage();
 
-            if ( rootMsg != null && error.getMessage().indexOf( rootMsg ) < 0 )
+            if ( rootMsg != null && ( error.getMessage() == null || error.getMessage().indexOf( rootMsg ) < 0 ) )
             {
                 message.append( "\n" ).append( rootMsg );