Author: davsclaus
Date: Fri Jun 15 15:46:45 2012
New Revision: 1350664
URL: http://svn.apache.org/viewvc?rev=1350664&view=rev
Log:
CAMEL-5223: Fixed loadResourceAsURL in osgi
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1350662
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java?rev=1350664&r1=1350663&r2=1350664&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
Fri Jun 15 15:46:45 2012
@@ -69,7 +69,7 @@ public class OsgiClassResolver extends D
public URL loadResourceAsURL(String uri) {
ObjectHelper.notEmpty(uri, "uri");
- return bundleContext.getBundle().getEntry(uri);
+ return bundleContext.getBundle().getResource(uri);
}
protected Class<?> doLoadClass(String name, Bundle loader) {
