sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 13:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix thread race issue when connecting to cormorant electrum server

Browse source
This commit is contained in:
Craig Raw 2023-10-24 10:51:09 +02:00
parent b6bcdef712
commit 158ecd4ab1
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/sparrowwallet/sparrow/net/TcpTransport.java
View file

@ -1,6 +1,5 @@
package com.sparrowwallet.sparrow.net; package com.sparrowwallet.sparrow.net;
import com.github.arteam.simplejsonrpc.client.Transport;
import com.github.arteam.simplejsonrpc.server.JsonRpcServer; import com.github.arteam.simplejsonrpc.server.JsonRpcServer;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.net.HostAndPort; import com.google.common.net.HostAndPort;
@ -19,6 +18,7 @@ import java.net.SocketTimeoutException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -40,6 +40,8 @@ public class TcpTransport implements CloseableTransport, TimeoutCounter {
private String response; private String response;
private final CountDownLatch readReadySignal = new CountDownLatch(1);
private final ReentrantLock readLock = new ReentrantLock(); private final ReentrantLock readLock = new ReentrantLock();
private final Condition readingCondition = readLock.newCondition(); private final Condition readingCondition = readLock.newCondition();
@ -110,6 +112,17 @@ public class TcpTransport implements CloseableTransport, TimeoutCounter {
} }
private String readResponse() throws IOException { private String readResponse() throws IOException {
if(firstRead) {
try {
//Ensure read thread has started
if(!readReadySignal.await(2, TimeUnit.SECONDS)) {
throw new IOException("Read thread did not start");
}
} catch(InterruptedException e) {
throw new IOException("Read ready await interrupted");
}
}
try { try {
if(!readLock.tryLock((readTimeouts[readTimeoutIndex] * 1000L) + (requestIdCount * PER_REQUEST_READ_TIMEOUT_MILLIS), TimeUnit.MILLISECONDS)) { if(!readLock.tryLock((readTimeouts[readTimeoutIndex] * 1000L) + (requestIdCount * PER_REQUEST_READ_TIMEOUT_MILLIS), TimeUnit.MILLISECONDS)) {
readTimeoutIndex = Math.min(readTimeoutIndex + 1, readTimeouts.length - 1); readTimeoutIndex = Math.min(readTimeoutIndex + 1, readTimeouts.length - 1);
@ -155,6 +168,7 @@ public class TcpTransport implements CloseableTransport, TimeoutCounter {
public void readInputLoop() throws ServerException { public void readInputLoop() throws ServerException {
readLock.lock(); readLock.lock();
readReadySignal.countDown();
try { try {
try { try {