camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [05/12] camel git commit: Fixed potential NPE
Date Thu, 19 Nov 2015 07:13:14 GMT
Fixed potential NPE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b1012ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b1012ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b1012ef

Branch: refs/heads/master
Commit: 5b1012ef4132bcdc3092287d7fcfcb3af206cefd
Parents: 8c938bc
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 19 07:48:30 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Nov 19 07:48:30 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/http4/HttpEndpoint.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5b1012ef/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index c5c82bc..b589e65 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -132,7 +132,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
         clientBuilder.setDefaultCookieStore(cookieStore);
         // setup the httpConnectionManager
         clientBuilder.setConnectionManager(clientConnectionManager);
-        if (getClientConnectionManager() == getComponent().getClientConnectionManager())
{
+        if (getComponent() != null && getComponent().getClientConnectionManager()
== getClientConnectionManager()) {
             clientBuilder.setConnectionManagerShared(true);
         }
 


Mime
View raw message