mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-22 20:12:07 +01:00
Fixed possible delay when TLS is not supported by the server. SMACK-161
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4773 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
f5c5213e61
commit
47cc26e234
2 changed files with 11 additions and 1 deletions
|
@ -477,7 +477,8 @@ class PacketReader {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (!startTLSReceived) {
|
||||
// Release the lock after TLS has been negotiated or we are not insterested in TLS
|
||||
if (!startTLSReceived || !connection.getConfiguration().isTLSEnabled()) {
|
||||
releaseConnectionIDLock();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1069,6 +1069,15 @@ public class XMPPConnection {
|
|||
return saslAuthentication;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the configuration used while connecting to the server.
|
||||
*
|
||||
* @return the configuration used while connecting to the server.
|
||||
*/
|
||||
ConnectionConfiguration getConfiguration() {
|
||||
return configuration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Notification message saying that the server supports TLS so confirm the server that we
|
||||
* want to secure the connection.
|
||||
|
|
Loading…
Reference in a new issue