[maven] 01/03: [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator

[slachiewicz]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-6819-2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 14c9e156bce509fc36f2590c93d80fb913611871
Author: 碎镜 <shenda...@alibaba-inc.com>
AuthorDate: Fri Dec 13 20:07:20 2019 +0800

    [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
    
    Closes #301
---
 apache-maven/src/assembly/maven/bin/mvnDebug                            | 0
 apache-maven/src/assembly/maven/bin/mvnyjp                              | 0
 .../maven/model/interpolation/StringVisitorModelInterpolator.java       | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-maven/src/assembly/maven/bin/mvnDebug 
b/apache-maven/src/assembly/maven/bin/mvnDebug
old mode 100644
new mode 100755
diff --git a/apache-maven/src/assembly/maven/bin/mvnyjp 
b/apache-maven/src/assembly/maven/bin/mvnyjp
old mode 100644
new mode 100755
diff --git 
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
index 98e36f6..313c4f7 100644
--- 
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 );
                         }