commit aa6328c77492a05186defa5a8799064b398eb6cf
author Carsten Ziegeler <cziegeler@apache.org> Fri Aug 01 11:46:45 2008 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Aug 01 11:46:45 2008 +0000
tree 3d258db474fa9ebb34f6e6181c0bd44ea5139c22
parent 0c45336a1090fd5a548e24cfa69754b5aed773fd

FELIX-653 :  Value of Java field is not used if property is specified by a name reference

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@681658 13f79535-47bb-0310-9956-ffa450edef68

scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java

diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
index eda9709..a808263 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
@@ -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());
                     }
                 }