commit 8cd4459acf86513e87dc0fc26738c1c3b7dd7e12
author Felix Meschberger <fmeschbe@apache.org> Wed Oct 24 20:04:56 2012 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Oct 24 20:04:56 2012 +0000
tree b6dc4740aea7c877f270850cf64874aabb25aa9f
parent 75987cb148433ba41acc05d1f7e4fe2547cfff72

FELIX-3733 Interim solution for the icon path problem: Check the path as a bundle entry first. If not a bundle entry try the solution using the XML descriptor files as the base.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1401851 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 d18dc32..443c0a6 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
@@ -156,7 +156,10 @@
 
         // just create an URL based on the source of the metadata
         // see FELIX2868
-        URL url = new URL( this.ocd.getMetadata().getSource(), iconPath );
+        URL url = this.bundle.getEntry( iconPath );
+        if (url == null) {
+            url = new URL( this.ocd.getMetadata().getSource(), iconPath );
+        }
         return url.openStream();
     }