You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2008/08/01 13:46:46 UTC
svn commit: r681658 -
/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
Author: cziegeler
Date: Fri Aug 1 04:46:45 2008
New Revision: 681658
URL: http://svn.apache.org/viewvc?rev=681658&view=rev
Log:
FELIX-653 : Value of Java field is not used if property is specified by a name reference
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java?rev=681658&r1=681657&r2=681658&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java Fri Aug 1 04:46:45 2008
@@ -97,7 +97,9 @@
} else {
// we have no value, valueRef or values so let's try to
// get the value of the field if a name attribute is specified
- if ( tag.getNamedParameter(Constants.PROPERTY_NAME) != null && javaField != null ) {
+ final boolean isNamedParameter = tag.getNamedParameter(Constants.PROPERTY_NAME) != null
+ || tag.getNamedParameter(Constants.PROPERTY_NAME_REF) != null;
+ if ( isNamedParameter && javaField != null ) {
this.setPropertyValueRef(tag, prop, javaField.getName());
}
}