You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2014/01/06 12:25:21 UTC

[08/21] git commit: potential NPE

potential NPE


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/44542105
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/44542105
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/44542105

Branch: refs/heads/master
Commit: 445421051c5d364839d3bcdf2fa35e3ecd06e9bc
Parents: 9bec8d7
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Jan 6 10:43:51 2014 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Jan 6 10:43:51 2014 +0000

----------------------------------------------------------------------
 .../org/apache/maven/artifact/versioning/ComparableVersion.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/44542105/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 6f06614..e79b238 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -309,7 +309,7 @@ public class ComparableVersion
                         Item r = right.hasNext() ? right.next() : null;
 
                         // if this is shorter, then invert the compare and mul with -1
-                        int result = l == null ? -1 * r.compareTo( l ) : l.compareTo( r );
+                        int result = l == null ? ( r == null ? 0 : -1 * r.compareTo( l ) ) : l.compareTo( r );
 
                         if ( result != 0 )
                         {