[MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator

Closes #301
2019-12-13 20:07:20 +08:00 · 2019-12-13 20:07:20 +08:00 · 2df61010c1
parent ba3234e7ae
commit 2df61010c1
3 changed files with 1 additions and 1 deletions
--- a/apache-maven/src/assembly/maven/bin/mvnDebug
+++ b/apache-maven/src/assembly/maven/bin/mvnDebug
--- a/apache-maven/src/assembly/maven/bin/mvnyjp
+++ b/apache-maven/src/assembly/maven/bin/mvnyjp
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
@ -1420,7 +1420,7 @@ public class StringVisitorModelInterpolator
                    {
                        String value = (String) v;
                        String inter = interpolate( value );
-                        if ( value != inter )
+                        if ( value != inter && inter != null )
                        {
                            entry.setValue( inter );
                        }