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

Posted to commits@maven.apache.org by pg...@apache.org on 2009/04/17 23:09:17 UTC

svn commit: r766157 - /maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java

Author: pgier
Date: Fri Apr 17 21:09:16 2009
New Revision: 766157

URL: http://svn.apache.org/viewvc?rev=766157&view=rev
Log:
[MSHARED-52] Applying patch from Sergey Klimenko.

Modified:
    maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java

Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java?rev=766157&r1=766156&r2=766157&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java Fri Apr 17 21:09:16 2009
@@ -197,6 +197,7 @@
      */
     protected boolean compareFeatures( String lhs, String rhs )
     {
-        return ( lhs.equals( rhs ) );
+        // If lhs is null, check that rhs is null. Otherwise check if strings are equal.
+        return ( lhs == null ? rhs == null : lhs.equals( rhs ) );
     }
 }