svn commit: r833726 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

[bentmann]

Author: bentmann
Date: Sat Nov  7 18:16:36 2009
New Revision: 833726

URL: http://svn.apache.org/viewvc?rev=833726&view=rev
Log:
o Fixed NPE

Modified:
    maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=833726&r1=833725&r2=833726&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Sat Nov  7 18:16:36 2009
@@ -382,17 +382,17 @@
                 boolean warning = request.getValidationLevel() < ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0;
 
                 String msg;
-                if ( StringUtils.isEmpty( existing.getVersion() ) && StringUtils.isEmpty( dependency.getVersion() ) )
+                if ( StringUtils.clean( existing.getVersion() ).equals( StringUtils.clean( dependency.getVersion() ) ) )
                 {
-                    msg = "duplicate declaration";
-                }
-                else if ( existing.getVersion().equals( dependency.getVersion() ) )
-                {
-                    msg = "duplicate declaration of version " + dependency.getVersion();
+                    msg =
+                        "duplicate declaration of version "
+                            + StringUtils.defaultString( dependency.getVersion(), "(?)" );
                 }
                 else
                 {
-                    msg = "version " + existing.getVersion() + " vs " + dependency.getVersion();
+                    msg =
+                        "version " + StringUtils.defaultString( existing.getVersion(), "(?)" ) + " vs "
+                            + StringUtils.defaultString( dependency.getVersion(), "(?)" );
                 }
 
                 addViolation( problems, warning, "'" + prefix