From 14c9e156bce509fc36f2590c93d80fb913611871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A2=8E=E9=95=9C?= Date: Fri, 13 Dec 2019 20:07:20 +0800 Subject: [PATCH] [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator Closes #301 --- apache-maven/src/assembly/maven/bin/mvnDebug | 0 apache-maven/src/assembly/maven/bin/mvnyjp | 0 .../model/interpolation/StringVisitorModelInterpolator.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 apache-maven/src/assembly/maven/bin/mvnDebug mode change 100644 => 100755 apache-maven/src/assembly/maven/bin/mvnyjp 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 98e36f6cb4..313c4f7416 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 ); }