You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/10/24 16:09:36 UTC
[3/6] flink git commit: [hotfix] make BlobServer#serverSSLContext
final
[hotfix] make BlobServer#serverSSLContext final
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0dd5d704
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0dd5d704
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0dd5d704
Branch: refs/heads/master
Commit: 0dd5d704dccb558379748a52ec64f13daae0d8aa
Parents: b03bb9b
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Thu Jul 27 13:56:13 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Oct 24 18:08:30 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/runtime/blob/BlobServer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0dd5d704/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
index 402a739..ec6044a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
@@ -78,7 +78,7 @@ public class BlobServer extends Thread implements BlobService, PermanentBlobServ
private final ServerSocket serverSocket;
/** The SSL server context if ssl is enabled for the connections */
- private SSLContext serverSSLContext = null;
+ private final SSLContext serverSSLContext;
/** Blob Server configuration */
private final Configuration blobServiceConfiguration;
@@ -178,6 +178,8 @@ public class BlobServer extends Thread implements BlobService, PermanentBlobServ
} catch (Exception e) {
throw new IOException("Failed to initialize SSLContext for the blob server", e);
}
+ } else {
+ serverSSLContext = null;
}
// ----------------------- start the server -------------------