cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [2/2] cxf git commit: Fixes for OSGi
Date Wed, 20 Jan 2016 12:43:57 GMT
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 <chris@die-schneider.net>
Authored: Tue Jan 19 16:33:38 2016 +0100
Committer: Christian Schneider <chris@die-schneider.net>
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<Extension> 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);


Mime
View raw message