vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:igniterealtime/Smack

Browse source
This commit is contained in:
Florian Schmaus 2020-06-04 22:51:17 +02:00
commit 6a617af158
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-core/src/main/java/org/jivesoftware/smack/c2s/ModularXmppClientToServerConnection.java
View file

@ -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 successorStateVertex the successor state vertex.
* @param walkStateGraphContext the "walk state graph" context. * @param walkStateGraphContext the "walk state graph" context.

2
smack-core/src/main/java/org/jivesoftware/smack/fsm/StateDescriptor.java
View file

@ -212,7 +212,7 @@ public abstract class StateDescriptor {
protected State constructState(ModularXmppClientToServerConnectionInternal connectionInternal) { protected State constructState(ModularXmppClientToServerConnectionInternal connectionInternal) {
ModularXmppClientToServerConnection connection = connectionInternal.connection; ModularXmppClientToServerConnection connection = connectionInternal.connection;
try { 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? // StateDescriptor.constructState() method?
return stateClassConstructor.newInstance(connection, this, connectionInternal); return stateClassConstructor.newInstance(connection, this, connectionInternal);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException } catch (InstantiationException | IllegalAccessException | IllegalArgumentException

2
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
View file

@ -26,7 +26,7 @@ import org.jivesoftware.smack.ConnectionConfiguration;
* </p> * </p>
* <pre> * <pre>
* {@code * {@code
* XMPPTCPConnectionConfiguration conf = XMPPConnectionConfiguration.builder() * XMPPTCPConnectionConfiguration conf = XMPPTCPConnectionConfiguration.builder()
* .setXmppDomain("example.org").setUsernameAndPassword("user", "password") * .setXmppDomain("example.org").setUsernameAndPassword("user", "password")
* .setCompressionEnabled(false).build(); * .setCompressionEnabled(false).build();
* XMPPTCPConnection connection = new XMPPTCPConnection(conf); * XMPPTCPConnection connection = new XMPPTCPConnection(conf);

2
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppTcpTransportModule.java
View file

@ -587,7 +587,7 @@ public class XmppTcpTransportModule extends ModularXmppClientToServerConnectionM
@Override @Override
protected List<SmackFuture<LookupConnectionEndpointsResult, Exception>> lookupConnectionEndpoints() { 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; assert discoveredTcpEndpoints == null;
List<SmackFuture<LookupConnectionEndpointsResult, Exception>> futures = new ArrayList<>(2); List<SmackFuture<LookupConnectionEndpointsResult, Exception>> futures = new ArrayList<>(2);