SM-2218 Do not throw exception in the SimpleBeanFactory getAliases() method
git-svn-id: https://svn.apache.org/repos/asf/servicemix/components/trunk@1550051 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/engines/servicemix-camel/pom.xml b/engines/servicemix-camel/pom.xml
index f6625ed..86e5178 100644
--- a/engines/servicemix-camel/pom.xml
+++ b/engines/servicemix-camel/pom.xml
@@ -189,6 +189,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <version>${camel.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
<scope>test</scope>
diff --git a/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java b/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
new file mode 100644
index 0000000..7a9c923
--- /dev/null
+++ b/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.camel;
+
+
+import java.util.List;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+
+public class JAXBConverterLoadingSpringTest extends SpringJbiTestSupport {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void test() throws Exception {
+ // We just need to make sure the fallbackConverter can be load
+ assertTrue(true);
+ }
+
+ @Override
+ protected String getServiceUnitName() {
+ return "su14";
+ }
+
+ @Override
+ protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
+ }
+}
\ No newline at end of file
diff --git a/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml b/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
new file mode 100644
index 0000000..513828c
--- /dev/null
+++ b/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<!-- START SNIPPET: camel -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring" id="su14">
+ <route>
+ <from uri="direct:start"/>
+ <convertBodyTo type="org.apache.servicemix.camel.su14.Person"/>
+ <to uri="mock:result"/>
+ </route>
+ </camelContext>
+
+ <!-- setup AOP to inject the interceptor -->
+ <bean class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
+ <property name="beanNames">
+ <list>
+ <value>*Handler</value>
+ </list>
+ </property>
+ <property name="interceptorNames">
+ <value>transactionInterceptor</value>
+ </property>
+ </bean>
+
+</beans>
+<!-- END SNIPPET: camel -->
diff --git a/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java b/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
index f9a3f0e..f2329b9 100644
--- a/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
+++ b/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
@@ -44,10 +44,11 @@
}
public String[] getAliases(String name) throws NoSuchBeanDefinitionException {
Object bean = beans.get(name);
- if (bean == null) {
- throw new NoSuchBeanDefinitionException(name);
+ if (bean != null) {
+ return new String[]{name};
+ } else {
+ return new String[0];
}
- return new String[0];
}
public Object getBean(String name) throws BeansException {
return getBean(name, (Class) null);
@@ -110,4 +111,4 @@
return false;
}
-}
\ No newline at end of file
+}
