aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csie...@apache.org
Subject [3/4] aries-jax-rs-whiteboard git commit: These are independent
Date Thu, 14 Sep 2017 07:29:28 GMT
These are independent


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/a7c3e429
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/a7c3e429
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/a7c3e429

Branch: refs/heads/master
Commit: a7c3e4293e5b2d2b1d89c01c57fb675e80afd156
Parents: 421697c
Author: Carlos Sierra <csierra@apache.org>
Authored: Tue Sep 12 09:27:23 2017 +0200
Committer: Carlos Sierra <csierra@apache.org>
Committed: Tue Sep 12 09:27:23 2017 +0200

----------------------------------------------------------------------
 .../whiteboard/activator/CXFJaxRsBundleActivator.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a7c3e429/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
index effd182..3c4359e 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
@@ -24,6 +24,7 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.ext.RuntimeDelegate;
 
 import org.apache.aries.jax.rs.whiteboard.internal.ClientBuilderFactory;
+import org.apache.aries.jax.rs.whiteboard.internal.Utils;
 import org.apache.aries.jax.rs.whiteboard.internal.Whiteboard;
 import org.apache.aries.osgi.functional.OSGi;
 import org.apache.aries.osgi.functional.OSGiResult;
@@ -34,7 +35,9 @@ import org.osgi.framework.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.aries.jax.rs.whiteboard.internal.Utils.ignoreResult;
 import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.createWhiteboard;
+import static org.apache.aries.osgi.functional.OSGi.all;
 import static org.apache.aries.osgi.functional.OSGi.configurations;
 import static org.apache.aries.osgi.functional.OSGi.just;
 import static org.apache.aries.osgi.functional.OSGi.onClose;
@@ -72,9 +75,12 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
             "org.apache.aries.jax.rs.whiteboard.default");
 
         _defaultOSGiResult =
-            register(
-                ClientBuilder.class, new ClientBuilderFactory(), null).then(
-            runWhiteboard(bundleContext, defaultConfiguration))
+            all(
+                ignoreResult(
+                    register(
+                        ClientBuilder.class, new ClientBuilderFactory(), null)),
+                ignoreResult(runWhiteboard(bundleContext, defaultConfiguration))
+            )
         .run(bundleContext);
 
         if (_log.isDebugEnabled()) {


Mime
View raw message