Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-02 14:55:58 +01:00
Code Issues Releases Wiki Activity

Remove try/catch in startTLSReceived

Browse source 
as exceptions are catched further up the call stack.
This commit is contained in:
Florian Schmaus 2014-04-26 18:13:33 +02:00
parent 08cec251c7
commit 2cd7bbadc5
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
View file

@ -615,8 +615,9 @@ public class XMPPTCPConnection extends XMPPConnection {
* want to secure the connection. * want to secure the connection.
* *
* @param required true when the server indicates that TLS is required. * @param required true when the server indicates that TLS is required.
* @throws IOException if an exception occurs.
*/ */
void startTLSReceived(boolean required) { void startTLSReceived(boolean required) throws IOException {
if (required && config.getSecurityMode() == if (required && config.getSecurityMode() ==
ConnectionConfiguration.SecurityMode.disabled) { ConnectionConfiguration.SecurityMode.disabled) {
notifyConnectionError(new IllegalStateException( notifyConnectionError(new IllegalStateException(
@ -628,14 +629,9 @@ public class XMPPTCPConnection extends XMPPConnection {
// Do not secure the connection using TLS since TLS was disabled // Do not secure the connection using TLS since TLS was disabled
return; return;
} }
try {
writer.write("<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>"); writer.write("<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>");
writer.flush(); writer.flush();
} }
catch (IOException e) {
notifyConnectionError(e);
}
}
/** /**
* The server has indicated that TLS negotiation can start. We now need to secure the * The server has indicated that TLS negotiation can start. We now need to secure the