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

Posted to commits@maven.apache.org by rf...@apache.org on 2014/08/03 20:52:49 UTC

svn commit: r1615435 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java

Author: rfscholte
Date: Sun Aug  3 18:52:49 2014
New Revision: 1615435

URL: http://svn.apache.org/r1615435
Log:
fix incorrect equals when cpString is null

Modified:
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1615435&r1=1615434&r2=1615435&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java Sun Aug  3 18:52:49 2014
@@ -329,7 +329,7 @@ public class BuildClasspathMojo
         try
         {
             String oldCp = readClasspathFile();
-            return (cpString.equals(oldCp) || ( cpString != null && cpString.equals( oldCp ) ) );
+            return ( cpString == null ? oldCp == null : cpString.equals( oldCp ) );
         }
         catch ( Exception ex )
         {