Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 3BBA618E0F for ; Wed, 20 Jan 2016 12:43:57 +0000 (UTC) Received: (qmail 32055 invoked by uid 500); 20 Jan 2016 12:43:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31994 invoked by uid 500); 20 Jan 2016 12:43:57 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 31981 invoked by uid 99); 20 Jan 2016 12:43:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2016 12:43:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8C6EDFADE; Wed, 20 Jan 2016 12:43:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@cxf.apache.org Date: Wed, 20 Jan 2016 12:43:57 -0000 Message-Id: <36515a38b7004deb9f70b81927519b51@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Fixes for OSGi Fixes for OSGi Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae70cdfc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae70cdfc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae70cdfc Branch: refs/heads/master Commit: ae70cdfcd5ebbb63a84236d61055e5cf233df5bc Parents: fa76530 Author: Christian Schneider Authored: Tue Jan 19 16:33:38 2016 +0100 Committer: Christian Schneider Committed: Wed Jan 20 13:43:45 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java | 7 ++++++- core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ae70cdfc/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java index 390b76c..400dfd9 100644 --- a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java +++ b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java @@ -44,7 +44,12 @@ public final class NamespaceHandlerRegisterer { LOG.info("Registered blueprint namespace handler for " + namespace); } } catch (Throwable e) { - LOG.log(Level.WARNING, "Aries Blueprint packages not available. So namespaces will not be registered", e); + String msg = "Aries Blueprint packages not available. So namespaces will not be registered"; + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.WARNING, msg, e); + } else { + LOG.log(Level.WARNING, msg); + } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/ae70cdfc/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java index 030c8a0..c66d136 100644 --- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java +++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java @@ -47,7 +47,7 @@ import org.osgi.util.tracker.ServiceTracker; public class CXFActivator implements BundleActivator { private List extensions; - private ManagedWorkQueueList workQueues = new ManagedWorkQueueList(); + private ManagedWorkQueueList workQueues; private ServiceTracker configAdminTracker; private CXFExtensionBundleListener cxfBundleListener; private ServiceRegistration workQueueServiceRegistration; @@ -56,6 +56,7 @@ public class CXFActivator implements BundleActivator { /** {@inheritDoc}*/ public void start(BundleContext context) throws Exception { + workQueues = new ManagedWorkQueueList(); cxfBundleListener = new CXFExtensionBundleListener(context.getBundle().getBundleId()); context.addBundleListener(cxfBundleListener); cxfBundleListener.registerExistingBundles(context);