[maven] branch maven-3.8.x updated: [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator

[michaelo]

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

michaelo pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.8.x by this push:
     new 2f144de  [MNG-6819] Fix NullPointerException in 
StringVisitorModelInterpolator
2f144de is described below

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

    [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
    
    Closes #301
---
 .../maven/model/interpolation/StringSearchModelInterpolator.java      | 4 ++--
 .../maven/model/interpolation/StringVisitorModelInterpolator.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index 9b67a34..6853030 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -369,7 +369,7 @@ public class StringSearchModelInterpolator
 
                 String interpolated = ctx.interpolate( value );
 
-                if ( !interpolated.equals( value ) )
+                if ( interpolated != null && !interpolated.equals( value ) )
                 {
                     field.set( target, interpolated );
                 }
@@ -463,7 +463,7 @@ public class StringSearchModelInterpolator
                     {
                         String interpolated = ctx.interpolate( (String) value 
);
 
-                        if ( !interpolated.equals( value ) )
+                        if ( interpolated != null && !interpolated.equals( 
value ) )
                         {
                             try
                             {
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 02c7c88..3264630 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
@@ -1424,7 +1424,7 @@ public class StringVisitorModelInterpolator
                     {
                         String value = (String) v;
                         String inter = interpolate( value );
-                        if ( value != inter )
+                        if ( value != inter && inter != null )
                         {
                             entry.setValue( inter );
                         }