Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 7b9ed5feb -> 22cc2a6da
[CXF-6550] Avoiding NPE if the properties are null, thanks to Alexey Markevich Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/22cc2a6d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/22cc2a6d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/22cc2a6d Branch: refs/heads/3.0.x-fixes Commit: 22cc2a6dab1c9e0b9f80efc60d9a47b8b2c09c0b Parents: 7b9ed5f Author: Sergey Beryozkin <[email protected]> Authored: Wed Aug 19 12:14:59 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Aug 19 12:16:20 2015 +0100 ---------------------------------------------------------------------- .../cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/22cc2a6d/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java index 6158d44..089ed04 100644 --- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java +++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java @@ -168,6 +168,9 @@ public class AsyncHTTPConduitFactory implements HTTPConduitFactory { private boolean setProperties(Map<String, Object> s) { //properties that can be updated "live" + if (s == null) { + return false; + } Object st = s.get(USE_POLICY); if (st == null) { st = SystemPropertyAction.getPropertyOrNull(USE_POLICY);
