| commit | e969ba68c0b2942b718676097a1f1ba601ac1291 | [log] [tgz] |
|---|---|---|
| author | Alexey Kuznetsov <akuznetsov@apache.org> | Wed Feb 06 22:40:41 2019 +0700 |
| committer | Alexey Kuznetsov <akuznetsov@apache.org> | Wed Feb 06 22:40:41 2019 +0700 |
| tree | 49c6db7d494f1ca8b6943210c69f60474daf82a2 | |
| parent | 3d80009cdcfede3f9b369e915c7554cb49a804fc [diff] |
IGNITE-11220 Web Console: Fixed NPE in Web Agent in case of using SSL without trust manager. Fixes #6036.
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java b/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java index 62c976e..2eddee8 100644 --- a/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java +++ b/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
@@ -368,7 +368,10 @@ ); if (sslSocketFactory != null) { - builder.sslSocketFactory(sslSocketFactory, serverTrustMgr); + if (serverTrustMgr != null) + builder.sslSocketFactory(sslSocketFactory, serverTrustMgr); + else + builder.sslSocketFactory(sslSocketFactory); if (!F.isEmpty(cipherSuites)) builder.connectionSpecs(sslConnectionSpec(cipherSuites));
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java b/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java index 374533f..d5f2c1e 100644 --- a/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java +++ b/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
@@ -115,7 +115,10 @@ ); if (sslSocketFactory != null) { - builder.sslSocketFactory(sslSocketFactory, trustMgr); + if (trustMgr != null) + builder.sslSocketFactory(sslSocketFactory, trustMgr); + else + builder.sslSocketFactory(sslSocketFactory); if (!F.isEmpty(cipherSuites)) builder.connectionSpecs(sslConnectionSpec(cipherSuites));