You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/17 09:06:37 UTC
[1/2] camel git commit: CAMEL-10708: Fixed potential NPE when setting
username/password
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 67adfe18a -> 0d3e98ccf
refs/heads/camel-2.18.x 0f3a0c2d6 -> 489d21f9d
CAMEL-10708: Fixed potential NPE when setting username/password
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/489d21f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/489d21f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/489d21f9
Branch: refs/heads/camel-2.18.x
Commit: 489d21f9d603e720ff9ba7f1a4d9e1275f19458e
Parents: 0f3a0c2
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 17 10:05:21 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:05:54 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/489d21f9/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 526ff8f..e6bf822 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -504,8 +504,6 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
if (getServiceName() != null) {
factoryBean.setServiceName(getServiceName());
}
-
-
// port name qname
if (getPortName() != null) {
@@ -555,6 +553,9 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
AuthorizationPolicy authPolicy = new AuthorizationPolicy();
authPolicy.setUserName(username);
authPolicy.setPassword(password);
+ if (factoryBean.getProperties() == null) {
+ factoryBean.setProperties(new HashMap<String, Object>());
+ }
factoryBean.getProperties().put(AuthorizationPolicy.class.getName(), authPolicy);
}
[2/2] camel git commit: CAMEL-10708: Fixed potential NPE when setting
username/password
Posted by da...@apache.org.
CAMEL-10708: Fixed potential NPE when setting username/password
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0d3e98cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d3e98cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d3e98cc
Branch: refs/heads/camel-2.17.x
Commit: 0d3e98ccf51a8b96d18a184cbbe0643f410a1d7e
Parents: 67adfe1
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 17 10:05:21 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:06:17 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0d3e98cc/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 2794100..a487cd1 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -498,8 +498,6 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
if (getServiceName() != null) {
factoryBean.setServiceName(getServiceName());
}
-
-
// port name qname
if (getPortName() != null) {
@@ -549,6 +547,9 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
AuthorizationPolicy authPolicy = new AuthorizationPolicy();
authPolicy.setUserName(username);
authPolicy.setPassword(password);
+ if (factoryBean.getProperties() == null) {
+ factoryBean.setProperties(new HashMap<String, Object>());
+ }
factoryBean.getProperties().put(AuthorizationPolicy.class.getName(), authPolicy);
}