You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jb...@apache.org on 2017/09/03 05:41:07 UTC

[1/2] beam git commit: ElasticsearchIO: Fix Null Pointer Exception in keystore management

Repository: beam
Updated Branches:
  refs/heads/master 2389d56a4 -> 80aebd902


ElasticsearchIO: Fix Null Pointer Exception in keystore management

When keystorePath is provided by the user but not keystorePassword, then keystorePassword == null, generating a Null Pointer Exception


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0cefc8a1
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0cefc8a1
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0cefc8a1

Branch: refs/heads/master
Commit: 0cefc8a189c1178f4d1cb4aa90ee757a9a164a00
Parents: c9653f2
Author: Etienne Chauchot <ec...@gmail.com>
Authored: Fri Sep 1 16:31:32 2017 +0200
Committer: Etienne Chauchot <ec...@gmail.com>
Committed: Fri Sep 1 16:42:37 2017 +0200

----------------------------------------------------------------------
 .../org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/0cefc8a1/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
index e6a6a9f..5b8e4e5 100644
--- a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
+++ b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
@@ -319,7 +319,8 @@ public class ElasticsearchIO {
         try {
           KeyStore keyStore = KeyStore.getInstance("jks");
           try (InputStream is = new FileInputStream(new File(getKeystorePath()))) {
-            keyStore.load(is, getKeystorePassword().toCharArray());
+            String keystorePassword = getKeystorePassword();
+            keyStore.load(is, (keystorePassword == null) ? null : keystorePassword.toCharArray());
           }
           final SSLContext sslContext = SSLContexts.custom()
               .loadTrustMaterial(keyStore, new TrustSelfSignedStrategy()).build();


[2/2] beam git commit: This closes #3801

Posted by jb...@apache.org.
This closes #3801


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/80aebd90
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/80aebd90
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/80aebd90

Branch: refs/heads/master
Commit: 80aebd9026c2bc77eac6fc1e72cad1f6c76c7528
Parents: 2389d56 0cefc8a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Sep 2 08:24:55 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Sep 2 08:24:55 2017 +0200

----------------------------------------------------------------------
 .../org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------