Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 551e83863 -> 204fac343
[CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT is true (cherry picked from commit 802d168d4c772bd97a0c69a0f6c7dc639598f2ea) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/204fac34 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/204fac34 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/204fac34 Branch: refs/heads/3.1.x-fixes Commit: 204fac343576d897ae5fda233395426e31266d64 Parents: 551e838 Author: Freeman Fang <freeman.f...@gmail.com> Authored: Thu Feb 16 16:04:17 2017 +0800 Committer: Freeman Fang <freeman.f...@gmail.com> Committed: Thu Feb 16 16:04:47 2017 +0800 ---------------------------------------------------------------------- .../apache/cxf/transport/http/osgi/HTTPTransportActivator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/204fac34/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java index 3d95161..da2aa38 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java @@ -85,6 +85,8 @@ public class HTTPTransportActivator implements BundleActivator { } public void stop(BundleContext context) throws Exception { - httpServiceTracker.close(); + if (httpServiceTracker != null) { + httpServiceTracker.close(); + } } }
