camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] camel git commit: Fixed NPE
Date Tue, 28 Jun 2016 07:37:17 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 58bb80106 -> ca53a592f
  refs/heads/master def7febf3 -> 48e828313


Fixed NPE


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

Branch: refs/heads/master
Commit: 48e8283136af16ecadd2949ab3c6d15c06c2d980
Parents: 5b7a9d3
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Jun 28 09:34:13 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Jun 28 09:34:23 2016 +0200

----------------------------------------------------------------------
 .../util/jsse/AbstractSSLContextClientParametersFactoryBean.java | 4 +++-
 .../apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java  | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/48e82831/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractSSLContextClientParametersFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractSSLContextClientParametersFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractSSLContextClientParametersFactoryBean.java
index 5778264..f6a8b9c 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractSSLContextClientParametersFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractSSLContextClientParametersFactoryBean.java
@@ -34,7 +34,9 @@ public abstract class AbstractSSLContextClientParametersFactoryBean extends
Abst
     protected SSLContextClientParameters createInstance() {
         SSLContextClientParameters newInstance = new SSLContextClientParameters();
         newInstance.setCamelContext(getCamelContext());
-        newInstance.addAllSniHostNames(sniHostNamesDefinition.getSniHostName());
+        if (sniHostNamesDefinition != null) {
+            newInstance.addAllSniHostNames(sniHostNamesDefinition.getSniHostName());
+        }
         return newInstance;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/48e82831/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java
index c7d663b..1a86ed0 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SNIHostNamesDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.core.xml.util.jsse;
 
-import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;


Mime
View raw message