Check interpolated config value is non-null before applying it

mcculls · mcculls · commit f6e17bfab889 · 2022-01-29T23:02:33.000Z
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
@@ -65,7 +65,7 @@ public Configuration getConfiguration( final BeanProperty<?> property )
             // support runtime interpolation of @Configuration values
             final String uninterpolatedValue = configuration.value();
             final String value = interpolate( uninterpolatedValue );
-            if ( !value.equals( uninterpolatedValue ) )
+            if ( null != value && !value.equals( uninterpolatedValue ) )
             {
                 return new ConfigurationImpl( configuration.name(), value );
             }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public Configuration getConfiguration( final BeanProperty<?> property )`
`65`	`65`	`// support runtime interpolation of @Configuration values`
`66`	`66`	`final String uninterpolatedValue = configuration.value();`
`67`	`67`	`final String value = interpolate( uninterpolatedValue );`
`68`		`- if ( !value.equals( uninterpolatedValue ) )`
	`68`	`+ if ( null != value && !value.equals( uninterpolatedValue ) )`
`69`	`69`	`{`
`70`	`70`	`return new ConfigurationImpl( configuration.name(), value );`
`71`	`71`	`}`