|
68 | 68 | import javafx.beans.property.LongProperty;
|
69 | 69 | import javafx.beans.property.ReadOnlyDoubleProperty;
|
70 | 70 | import javafx.beans.value.ChangeListener;
|
71 |
| -import lombok.Getter; |
72 | 71 | import monero.common.MoneroError;
|
73 | 72 | import monero.common.MoneroRpcConnection;
|
74 | 73 | import monero.common.MoneroRpcError;
|
@@ -145,8 +144,7 @@ public class XmrWalletService extends XmrWalletBase {
|
145 | 144 | private TradeManager tradeManager;
|
146 | 145 | private ExecutorService syncWalletThreadPool = Executors.newFixedThreadPool(10); // TODO: adjust based on connection type
|
147 | 146 |
|
148 |
| - @Getter |
149 |
| - public final Object lock = new Object(); |
| 147 | + private final Object lock = new Object(); |
150 | 148 | private TaskLooper pollLooper;
|
151 | 149 | private boolean pollInProgress;
|
152 | 150 | private Long pollPeriodMs;
|
@@ -740,7 +738,7 @@ public MoneroTx verifyTradeTx(String offerId, BigInteger tradeFeeAmount, String
|
740 | 738 | MoneroDaemonRpc daemon = getDaemon();
|
741 | 739 | MoneroWallet wallet = getWallet();
|
742 | 740 | MoneroTx tx = null;
|
743 |
| - synchronized (daemon) { |
| 741 | + synchronized (lock) { |
744 | 742 | try {
|
745 | 743 |
|
746 | 744 | // verify tx not submitted to pool
|
@@ -926,7 +924,7 @@ public void shutDown() {
|
926 | 924 | }
|
927 | 925 |
|
928 | 926 | // shut down threads
|
929 |
| - synchronized (getLock()) { |
| 927 | + synchronized (lock) { |
930 | 928 | List<Runnable> shutDownThreads = new ArrayList<>();
|
931 | 929 | shutDownThreads.add(() -> ThreadUtils.shutDown(THREAD_ID));
|
932 | 930 | ThreadUtils.awaitTasks(shutDownThreads);
|
|
0 commit comments