Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6819] Fix also NPE in StringSearchModelInterpolator

This commit is contained in:
Sylwester Lachiewicz 2020-05-23 01:30:47 +02:00
parent be3c4eb406
commit 8177d3d114
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -365,7 +365,7 @@ void doInterpolate( Object target, InterpolateObjectAction ctx )
String interpolated = ctx.interpolate( value ); String interpolated = ctx.interpolate( value );
if ( !interpolated.equals( value ) ) if ( interpolated != null && !interpolated.equals( value ) )
{ {
field.set( target, interpolated ); field.set( target, interpolated );
} }
@ -459,7 +459,7 @@ void doInterpolate( Object target, InterpolateObjectAction ctx )
{ {
String interpolated = ctx.interpolate( (String) value ); String interpolated = ctx.interpolate( (String) value );
if ( !interpolated.equals( value ) ) if ( interpolated != null && !interpolated.equals( value ) )
{ {
try try
{ {