From 021ee24bb089c321029673e2c8998df4f8b0595f 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 1/3] Fix NullPointerException --- .../interpolation/StringVisitorModelInterpolator.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 02c7c889c5d5..7369e56a97fc 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 @@ -20,11 +20,7 @@ */ import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Properties; +import java.util.*; import javax.inject.Named; import javax.inject.Singleton; @@ -1424,7 +1420,7 @@ private void visit( Properties properties ) { String value = (String) v; String inter = interpolate( value ); - if ( value != inter ) + if ( value != inter && Objects.nonNull( inter ) ) { entry.setValue( inter ); } From ca9eddfc496d500716e3af47c82e75f5a9528cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A2=8E=E9=95=9C?= Date: Fri, 13 Dec 2019 20:14:24 +0800 Subject: [PATCH 2/3] re-formatting --- .../interpolation/StringVisitorModelInterpolator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 7369e56a97fc..ce1559f5c887 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 @@ -20,7 +20,12 @@ */ import java.io.File; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; import javax.inject.Named; import javax.inject.Singleton; From f81cb57f6b76d52d717a70e782e130d6358efe0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A2=8E=E9=95=9C?= Date: Fri, 13 Dec 2019 21:23:15 +0800 Subject: [PATCH 3/3] Simplify --- .../model/interpolation/StringVisitorModelInterpolator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 ce1559f5c887..32646304f6d5 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 @@ -24,7 +24,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import java.util.Objects; import java.util.Properties; import javax.inject.Named; @@ -1425,7 +1424,7 @@ private void visit( Properties properties ) { String value = (String) v; String inter = interpolate( value ); - if ( value != inter && Objects.nonNull( inter ) ) + if ( value != inter && inter != null ) { entry.setValue( inter ); }