You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/04/13 12:08:41 UTC
[2/2] ignite git commit: IGNITE-8248 Fixed npe in Web Console agent
int case of self-signed certificate.
IGNITE-8248 Fixed npe in Web Console agent int case of self-signed certificate.
(cherry picked from commit 8a42f64)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db3099e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db3099e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db3099e0
Branch: refs/heads/ignite-2.5
Commit: db3099e079022a8acc081b284f96583280742567
Parents: 78e7414
Author: Andrey Novikov <an...@gridgain.com>
Authored: Fri Apr 13 18:08:35 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Apr 13 19:08:24 2018 +0700
----------------------------------------------------------------------
.../org/apache/ignite/console/agent/AgentLauncher.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/db3099e0/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
index 4db26ba..385ce08 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
@@ -32,6 +32,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.UnknownHostException;
+import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -122,18 +123,16 @@ public class AgentLauncher {
return new TrustManager[] {
new X509TrustManager() {
/** {@inheritDoc} */
- @Override public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return null;
+ @Override public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[0];
}
/** {@inheritDoc} */
- @Override public void checkClientTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
+ @Override public void checkClientTrusted(X509Certificate[] certs, String authType) {
}
/** {@inheritDoc} */
- @Override public void checkServerTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
+ @Override public void checkServerTrusted(X509Certificate[] certs, String authType) {
}
}};
}