cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject cxf git commit: [CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT is true
Date Thu, 16 Feb 2017 08:04:29 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 1b8064f47 -> 802d168d4


[CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT is true


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/802d168d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/802d168d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/802d168d

Branch: refs/heads/master
Commit: 802d168d4c772bd97a0c69a0f6c7dc639598f2ea
Parents: 1b8064f
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Thu Feb 16 16:04:17 2017 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Thu Feb 16 16:04:17 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/802d168d/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 606150e..d39812b 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();
+        }
     }
 }


Mime
View raw message