narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

removed synchronized in favor of another interrupted check in startXmpp()

Browse source
This commit is contained in:
Daniel Gultsch 2018-09-01 10:07:40 +02:00
parent c05acccf17
commit 6d6bbc0a5d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -176,6 +176,8 @@ public class XmppConnection implements Runnable {
private volatile Thread mThread; private volatile Thread mThread;
private CountDownLatch mStreamCountDownLatch; private CountDownLatch mStreamCountDownLatch;
public XmppConnection(final Account account, final XmppConnectionService service) { public XmppConnection(final Account account, final XmppConnectionService service) {
this.account = account; this.account = account;
this.mXmppConnectionService = service; this.mXmppConnectionService = service;
@ -437,7 +439,7 @@ public class XmppConnection implements Runnable {
* *
* @return true if server returns with valid xmpp, false otherwise * @return true if server returns with valid xmpp, false otherwise
*/ */
private synchronized boolean startXmpp(Socket socket) throws Exception { private boolean startXmpp(Socket socket) throws Exception {
if (Thread.currentThread().isInterrupted()) { if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException(); throw new InterruptedException();
} }
@ -452,6 +454,9 @@ public class XmppConnection implements Runnable {
tagWriter.beginDocument(); tagWriter.beginDocument();
sendStartStream(); sendStartStream();
final Tag tag = tagReader.readTag(); final Tag tag = tagReader.readTag();
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
return tag != null && tag.isStart("stream"); return tag != null && tag.isStart("stream");
} }