Repository: camel Updated Branches: refs/heads/camel-2.14.x 865b7ffea -> e6cca31dd refs/heads/camel-2.15.x c89f27904 -> 8e9b48820 refs/heads/master 1aa206102 -> ae8ce7379
CAMEL-8500: Avoid ClassCastException if something else is bound to properties when starting CamelContext and looking up if there is a properties component defined. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae8ce737 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae8ce737 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae8ce737 Branch: refs/heads/master Commit: ae8ce7379ffae5c7d22086bc6e7d190bd3aa40f4 Parents: 1aa2061 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 21 07:38:24 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 21 07:38:24 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/util/CamelContextHelper.java | 8 ++- ...esComponentSomethingElseBoundToJndiTest.java | 60 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ae8ce737/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java index 39d9b73..1b01fef 100644 --- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java @@ -571,15 +571,17 @@ public final class CamelContextHelper { // no existing properties component so lookup and add as component if possible PropertiesComponent answer = (PropertiesComponent) camelContext.hasComponent("properties"); if (answer == null) { - answer = camelContext.getRegistry().lookupByNameAndType("properties", PropertiesComponent.class); - if (answer != null) { + // lookup what is stored under properties, as it may not be the Camel properties component + Object found = camelContext.getRegistry().lookupByName("properties"); + if (found != null && found instanceof PropertiesComponent) { + answer = (PropertiesComponent) found; camelContext.addComponent("properties", answer); } } if (answer == null && autoCreate) { // create a default properties component to be used as there may be default values we can use LOG.info("No existing PropertiesComponent has been configured, creating a new default PropertiesComponent with name: properties"); - // do not auto create using getComponent as spring autowrire by constructor causes a side effect + // do not auto create using getComponent as spring auto-wire by constructor causes a side effect answer = new PropertiesComponent(); camelContext.addComponent("properties", answer); } http://git-wip-us.apache.org/repos/asf/camel/blob/ae8ce737/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSomethingElseBoundToJndiTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSomethingElseBoundToJndiTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSomethingElseBoundToJndiTest.java new file mode 100644 index 0000000..4e96bda --- /dev/null +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSomethingElseBoundToJndiTest.java @@ -0,0 +1,60 @@ +/** + * 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.camel.component.properties; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.JndiRegistry; + +/** + * @version + */ +public class PropertiesComponentSomethingElseBoundToJndiTest extends ContextTestSupport { + + @Override + public boolean isUseRouteBuilder() { + return false; + } + + public void testPropertiesComponent() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("mock:result"); + } + }); + context.start(); + + getMockEndpoint("mock:result").expectedMessageCount(1); + + template.sendBody("direct:start", "Hello World"); + + assertMockEndpointsSatisfied(); + + // should not have a properties component + assertNull("Should not have a properties component", context.hasComponent("properties")); + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + // bind something else as properties, but this should not cause Camel to fail start + jndi.bind("properties", this); + return jndi; + } + +}
