Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FE4A10854 for ; Thu, 20 Feb 2014 08:13:11 +0000 (UTC) Received: (qmail 46351 invoked by uid 500); 20 Feb 2014 08:13:11 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 46262 invoked by uid 500); 20 Feb 2014 08:13:09 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 46252 invoked by uid 99); 20 Feb 2014 08:13:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Feb 2014 08:13:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 94994928EC7; Thu, 20 Feb 2014 08:13:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: CAMEL-7218 Updated the activator class name to be the camel-core one Date: Thu, 20 Feb 2014 08:13:08 +0000 (UTC) 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 Authored: Thu Feb 20 16:04:39 2014 +0800 Committer: Willem Jiang 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()); } }