commit 87ab6b62ae319f2807ee618decfa0a41ae12c106
author Jan Willem Janssen <jawi@apache.org> Thu Feb 04 16:13:51 2016 +0000
committer Jan Willem Janssen <jawi@apache.org> Thu Feb 04 16:13:51 2016 +0000
tree 288a702e18c14a279213af0bf7e93d305715e461
parent 998f269a0d5c2230c396240b260402c8cd14db10

FELIX-5173 - Metatype service's BundleResources ignore properties provided by fragment bundles.

- allow icon to also be provided by a fragment.



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

metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java b/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
index 3061caa..05b7405 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
@@ -154,7 +154,7 @@
 
         // 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 );