You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2012/10/24 22:04:57 UTC
svn commit: r1401851 -
/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
Author: fmeschbe
Date: Wed Oct 24 20:04:56 2012
New Revision: 1401851
URL: http://svn.apache.org/viewvc?rev=1401851&view=rev
Log:
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.
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=1401851&r1=1401850&r2=1401851&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 Wed Oct 24 20:04:56 2012
@@ -156,7 +156,10 @@ public class LocalizedObjectClassDefinit
// 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();
}