Commit bdd91418 authored by Guus der Kinderen's avatar Guus der Kinderen

Should procuess RuntimeExceptions gracefully (observed a NPE here).

parent 2c239e17
...@@ -541,7 +541,7 @@ public class ServerDialback { ...@@ -541,7 +541,7 @@ public class ServerDialback {
return false; return false;
} }
else { else {
if (SASLAuthentication.verifyCertificates(connection.getPeerCertificates(), hostname, true)) { if (SASLAuthentication.verifyCertificates(connection.getPeerCertificates(), hostname, true)) {
// If the remote host passes strong auth, just skip the dialback. // If the remote host passes strong auth, just skip the dialback.
Log.debug("ServerDialback: RS - Sending key verification result to OS: " + hostname); Log.debug("ServerDialback: RS - Sending key verification result to OS: " + hostname);
sb = new StringBuilder(); sb = new StringBuilder();
...@@ -751,7 +751,7 @@ public class ServerDialback { ...@@ -751,7 +751,7 @@ public class ServerDialback {
Log.debug("ServerDialback: db:verify answer was: " + doc.asXML()); Log.debug("ServerDialback: db:verify answer was: " + doc.asXML());
} }
} }
catch (DocumentException e) { catch (DocumentException | RuntimeException e) {
Log.error("An error occured connecting to the Authoritative Server", e); Log.error("An error occured connecting to the Authoritative Server", e);
// Thrown an error so <remote-connection-failed/> stream error condition is // Thrown an error so <remote-connection-failed/> stream error condition is
// sent to the Originating Server // sent to the Originating Server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment