Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master b60684356 -> 6e533f0df
No need to use TCCL 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/770cd697 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/770cd697 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/770cd697 Branch: refs/heads/master Commit: 770cd69796551802105c82764bcc0142d4db316b Parents: b606843 Author: Carlos Sierra <csie...@apache.org> Authored: Tue Mar 20 11:03:48 2018 +0100 Committer: Carlos Sierra <csie...@apache.org> Committed: Tue Mar 20 11:03:48 2018 +0100 ---------------------------------------------------------------------- .../activator/CxfJaxrsBundleActivator.java | 31 ++------------------ 1 file changed, 3 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/770cd697/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 26024f5..f99cee7 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 @@ -33,6 +33,7 @@ import org.apache.aries.jax.rs.whiteboard.internal.utils.PropertyHolder; import org.apache.aries.osgi.functional.OSGi; import org.apache.aries.osgi.functional.OSGiResult; import org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl; +import org.apache.cxf.jaxrs.sse.client.SseEventSourceBuilderImpl; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -167,42 +168,16 @@ public class CxfJaxrsBundleActivator implements BundleActivator { } private static OSGi<?> registerSseEventSourceFactory() { - ClassLoader classLoader = CxfJaxrsBundleActivator.class.getClassLoader(); - return register( SseEventSourceFactory.class, new SseEventSourceFactory() { @Override public SseEventSource.Builder newBuilder(WebTarget target) { - Thread thread = Thread.currentThread(); - - ClassLoader contextClassLoader = - thread.getContextClassLoader(); - - thread.setContextClassLoader(classLoader); - - try { - return SseEventSource.target(target); - } - finally { - thread.setContextClassLoader(contextClassLoader); - } + return new SseEventSourceBuilderImpl(){{target(target);}}; } @Override public SseEventSource newSource(WebTarget target) { - Thread thread = Thread.currentThread(); - - ClassLoader contextClassLoader = - thread.getContextClassLoader(); - - thread.setContextClassLoader(classLoader); - - try { - return SseEventSource.target(target).build(); - } - finally { - thread.setContextClassLoader(contextClassLoader); - } + return newBuilder(target).build(); } }, new Hashtable<>());
