vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '4.4'

This commit is contained in:
Florian Schmaus 2022-06-07 08:41:46 +02:00
parent 70d0843dd8 382ec723a8
commit 6be3eb194a
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/BOSHConfiguration.java
View File

@ -77,7 +77,7 @@ public final class BOSHConfiguration extends ConnectionConfiguration {
} }
public URI getURI() throws URISyntaxException { public URI getURI() throws URISyntaxException {
String uri = https ? "https://" : "http://" + getHostString() + ":" + this.port + file; String uri = (https ? "https://" : "http://") + getHostString() + ":" + this.port + file;
return new URI(uri); return new URI(uri);
} }

19
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View File

@ -1,6 +1,6 @@
/** /**
* *
* Copyright 2009 Jive Software, 2018-2021 Florian Schmaus. * Copyright 2009 Jive Software, 2018-2022 Florian Schmaus.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -2006,11 +2006,18 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
}, timeout, TimeUnit.MILLISECONDS); }, timeout, TimeUnit.MILLISECONDS);
addAsyncStanzaListener(stanzaListener, replyFilter); addAsyncStanzaListener(stanzaListener, replyFilter);
try { Runnable sendOperation = () -> {
sendStanza(stanza); try {
} sendStanza(stanza);
catch (NotConnectedException | InterruptedException exception) { }
future.setException(exception); catch (NotConnectedException | InterruptedException exception) {
future.setException(exception);
}
};
if (SmackConfiguration.TRUELY_ASYNC_SENDS) {
Async.go(sendOperation);
} else {
sendOperation.run();
} }
return future; return future;

12
smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
View File

@ -1,6 +1,6 @@
/** /**
* *
* Copyright 2003-2007 Jive Software, 2018-2021 Florian Schmaus. * Copyright 2003-2007 Jive Software, 2018-2022 Florian Schmaus.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -386,4 +386,14 @@ public final class SmackConfiguration {
} }
} }
} }
/**
* If enabled, causes {@link AbstractXMPPConnection} to create a thread for every asynchronous send operation. This
* is meant to work-around a shortcoming of Smack 4.4, where certain send operations are not asynchronous even if
* they should be. This is an expert setting, do not toggle if you do not understand the consequences or have been
* told to do so. Note that it is expected that this will not be needed in future Smack versions.
*
* @since 4.4.6
*/
public static boolean TRUELY_ASYNC_SENDS = false;
} }