Repository: camel Updated Branches: refs/heads/camel-2.17.x 1611b4645 -> b42856bbc refs/heads/master e4b2c9959 -> 6a908b80b
Better OSGi check in camel-cdi. A potential problem reported in https://issues.jboss.org/browse/SWARM-643 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a908b80 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a908b80 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a908b80 Branch: refs/heads/master Commit: 6a908b80bf84e00235522562aecd453e17057d7c Parents: e4b2c99 Author: Claus Ibsen <[email protected]> Authored: Wed Aug 31 15:17:32 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Aug 31 15:17:50 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6a908b80/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java index b5cbf58..3aabe6f 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java @@ -49,6 +49,8 @@ final class CdiCamelEnvironment { return true; } catch (ClassNotFoundException cause) { return false; + } catch (NoClassDefFoundError cause) { + return false; } }
