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 2017/03/16 08:19:20 UTC

svn commit: r1787139 - /felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java

Author: cziegeler
Date: Thu Mar 16 08:19:20 2017
New Revision: 1787139

URL: http://svn.apache.org/viewvc?rev=1787139&view=rev
Log:
FELIX-5590 : Add support for single value annotations and new key mapping

Modified:
    felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java

Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java?rev=1787139&r1=1787138&r2=1787139&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java Thu Mar 16 08:19:20 2017
@@ -118,7 +118,8 @@ public class Annotations
             final Field f = clazz.getField(PREFIX_CONSTANT);
             if ( Modifier.isStatic(f.getModifiers())
                  && Modifier.isPublic(f.getModifiers())
-                 && Modifier.isFinal(f.getModifiers()) )
+                 && Modifier.isFinal(f.getModifiers())
+                 && String.class.isAssignableFrom(f.getType()))
             {
                 final Object value = f.get(null);
                 if ( value != null )