Repository: camel Updated Branches: refs/heads/master 2e0ced97f -> 2db5fbf7a
CAMEL-7218 Updated the activator class name to be the camel-core one Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2db5fbf7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2db5fbf7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2db5fbf7 Branch: refs/heads/master Commit: 2db5fbf7a3bec00de819e7f426286d61eb6732ea Parents: 2e0ced9 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Feb 20 16:04:39 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Feb 20 16:12:40 2014 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/util/PlatformHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2db5fbf7/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java index 258248c..f7c40f5 100644 --- a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java @@ -44,7 +44,7 @@ public final class PlatformHelper { try { // Try to load the BundleActivator first Class.forName("org.osgi.framework.BundleActivator"); - Class<?> activatorClass = classLoader.loadClass("org.apache.camel.osgi.Activator"); + Class<?> activatorClass = classLoader.loadClass("org.apache.camel.impl.osgi.Activator"); Method getBundleMethod = activatorClass.getDeclaredMethod("getBundle"); Object bundle = getBundleMethod.invoke(null); return bundle != null; @@ -55,7 +55,7 @@ public final class PlatformHelper { } public static boolean isInOsgiEnvironment() { - return isInOsgiEnvironment(currentThread().getContextClassLoader()); + return isInOsgiEnvironment(PlatformHelper.class.getClassLoader()); } }
