| commit | b599d3aaac61e1268e301aafa0dac8b6f4fc6b98 | [log] [tgz] |
|---|---|---|
| author | Guillaume Nodet <gnodet@apache.org> | Mon Jul 27 08:28:11 2009 +0000 |
| committer | Guillaume Nodet <gnodet@apache.org> | Mon Jul 27 08:28:11 2009 +0000 |
| tree | 4fc49480e5ad5f534da36b13a3f688d29ced7c0d | |
| parent | 9299cc60a42919b4cde94097e7d341430382a611 [diff] |
FELIX-1274: Spring deployer fails when bean class is from java.* packages git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@798076 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java index fe5ec5e..7564ab0 100644 --- a/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java +++ b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
@@ -208,7 +208,10 @@ for (int i = 0; i < parts.length; i++) { int n = parts[i].lastIndexOf('.'); if (n > 0) { - refers.add(parts[i].substring(0, n)); + String pkg = parts[i].substring(0, n); + if (!pkg.startsWith("java.")) { + refers.add(parts[i].substring(0, n)); + } } } }
diff --git a/karaf/deployer/spring/src/test/resources/test.xml b/karaf/deployer/spring/src/test/resources/test.xml index b47596e..0b6ea23 100644 --- a/karaf/deployer/spring/src/test/resources/test.xml +++ b/karaf/deployer/spring/src/test/resources/test.xml
@@ -52,4 +52,8 @@ </osgi:service-properties> </osgi:service> + <bean id="uri" class="java.net.URI"> + <constructor-arg value="urn:resource"/> + </bean> + </beans>