Repository: camel Updated Branches: refs/heads/master ebd93ccf3 -> 30b298435
Remove unecessary inline import Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a39540 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a39540 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a39540 Branch: refs/heads/master Commit: 59a395409d1a04435e4cf45b266788eea49621c7 Parents: ebd93cc Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Fri Jan 15 18:46:22 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jan 16 11:58:25 2016 +0100 ---------------------------------------------------------------------- components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/59a39540/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java index cd55010..69c9bfe 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java @@ -26,6 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.main.MainSupport; import org.apache.deltaspike.cdise.api.CdiContainer; +import org.apache.deltaspike.cdise.api.CdiContainerLoader; /** * Camel CDI boot integration. Allows Camel and CDI to be booted up on the command line as a JVM process. @@ -85,7 +86,7 @@ public class Main extends MainSupport { @Override protected void doStart() throws Exception { // TODO: Use standard CDI Java SE support when CDI 2.0 becomes a prerequisite - org.apache.deltaspike.cdise.api.CdiContainer container = org.apache.deltaspike.cdise.api.CdiContainerLoader.getCdiContainer(); + CdiContainer container = CdiContainerLoader.getCdiContainer(); container.boot(); container.getContextControl().startContexts(); cdiContainer = container;