felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1728500 - /felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
Date Thu, 04 Feb 2016 16:13:51 GMT
Author: jawi
Date: Thu Feb  4 16:13:51 2016
New Revision: 1728500

URL: http://svn.apache.org/viewvc?rev=1728500&view=rev
Log:
FELIX-5173 - Metatype service's BundleResources ignore properties provided by fragment bundles.

- allow icon to also be provided by a fragment.


Modified:
    felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java

Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java?rev=1728500&r1=1728499&r2=1728500&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
(original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
Thu Feb  4 16:13:51 2016
@@ -154,7 +154,7 @@ public class LocalizedObjectClassDefinit
 
         // just create an URL based on the source of the metadata
         // see FELIX2868
-        URL url = this.bundle.getEntry( iconPath );
+        URL url = this.bundle.getResource( iconPath );
         if ( url == null )
         {
             url = new URL( this.ocd.getMetadata().getSource(), iconPath );



Mime
View raw message