You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/01/19 22:25:09 UTC
svn commit: r900965 -
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Author: bentmann
Date: Tue Jan 19 21:25:08 2010
New Revision: 900965
URL: http://svn.apache.org/viewvc?rev=900965&view=rev
Log:
o Fixed regression introduced by r900021
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java?rev=900965&r1=900964&r2=900965&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java Tue Jan 19 21:25:08 2010
@@ -156,7 +156,7 @@
if ( String.class == type )
{
String value = (String) fields[i].get( target );
- if ( value != null )
+ if ( value != null && !Modifier.isFinal( fields[i].getModifiers() ) )
{
String interpolated =
modelInterpolator.interpolateInternal( value, valueSources, postProcessors,
@@ -330,11 +330,6 @@
return false;
}
- if ( Modifier.isFinal( field.getModifiers() ) )
- {
- return false;
- }
-
return true;
}