You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/08/19 13:15:20 UTC
cxf git commit: [CXF-6550] Avoiding NPE if the properties are null,
thanks to Alexey Markevich
Repository: cxf
Updated Branches:
refs/heads/master d3e2ebd99 -> ae95e49c5
[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/ae95e49c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae95e49c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae95e49c
Branch: refs/heads/master
Commit: ae95e49c500b529236732a14c86b4c9e100ac143
Parents: d3e2ebd
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Aug 19 12:14:59 2015 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Aug 19 12:14:59 2015 +0100
----------------------------------------------------------------------
.../cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae95e49c/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);