mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-23 11:07:57 +01:00
Merge branch 'master' of github.com:igniterealtime/Smack
This commit is contained in:
commit
6a617af158
4 changed files with 4 additions and 4 deletions
|
@ -359,7 +359,7 @@ public final class ModularXmppClientToServerConnection extends AbstractXMPPConne
|
|||
}
|
||||
|
||||
/**
|
||||
* Attempt to enter a state. Note that this method may return <code>null</code> if this state can be safely ignored ignored.
|
||||
* Attempt to enter a state. Note that this method may return <code>null</code> if this state can be safely ignored.
|
||||
*
|
||||
* @param successorStateVertex the successor state vertex.
|
||||
* @param walkStateGraphContext the "walk state graph" context.
|
||||
|
|
|
@ -212,7 +212,7 @@ public abstract class StateDescriptor {
|
|||
protected State constructState(ModularXmppClientToServerConnectionInternal connectionInternal) {
|
||||
ModularXmppClientToServerConnection connection = connectionInternal.connection;
|
||||
try {
|
||||
// If stateClassConstructor is null here, then you probably forgot to override the the
|
||||
// If stateClassConstructor is null here, then you probably forgot to override the
|
||||
// StateDescriptor.constructState() method?
|
||||
return stateClassConstructor.newInstance(connection, this, connectionInternal);
|
||||
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
|
||||
|
|
|
@ -26,7 +26,7 @@ import org.jivesoftware.smack.ConnectionConfiguration;
|
|||
* </p>
|
||||
* <pre>
|
||||
* {@code
|
||||
* XMPPTCPConnectionConfiguration conf = XMPPConnectionConfiguration.builder()
|
||||
* XMPPTCPConnectionConfiguration conf = XMPPTCPConnectionConfiguration.builder()
|
||||
* .setXmppDomain("example.org").setUsernameAndPassword("user", "password")
|
||||
* .setCompressionEnabled(false).build();
|
||||
* XMPPTCPConnection connection = new XMPPTCPConnection(conf);
|
||||
|
|
|
@ -587,7 +587,7 @@ public class XmppTcpTransportModule extends ModularXmppClientToServerConnectionM
|
|||
|
||||
@Override
|
||||
protected List<SmackFuture<LookupConnectionEndpointsResult, Exception>> lookupConnectionEndpoints() {
|
||||
// Assert that there are no stale discovred endpoints prior performing the lookup.
|
||||
// Assert that there are no stale discovered endpoints prior performing the lookup.
|
||||
assert discoveredTcpEndpoints == null;
|
||||
|
||||
List<SmackFuture<LookupConnectionEndpointsResult, Exception>> futures = new ArrayList<>(2);
|
||||
|
|
Loading…
Reference in a new issue