Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stored channel timers failing

Browse Source
This commit is contained in:
Will Shackleton
2016-02-11 14:47:03 +00:00
parent 09a2ca64d2
commit f1b4db1540
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java
View File

@@ -207,10 +207,16 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
channelTimeoutHandler.schedule(new TimerTask() {
@Override
public void run() {
TransactionBroadcaster announcePeerGroup = getAnnouncePeerGroup();
removeChannel(channel);
announcePeerGroup.broadcastTransaction(channel.contract);
announcePeerGroup.broadcastTransaction(channel.refund);
try {
TransactionBroadcaster announcePeerGroup = getAnnouncePeerGroup();
removeChannel(channel);
announcePeerGroup.broadcastTransaction(channel.contract);
announcePeerGroup.broadcastTransaction(channel.refund);
} catch (Exception e) {
// Something went wrong closing the channel - we catch
// here or else we take down the whole Timer.
log.error("Auto-closing channel failed", e);
}
}
// Add the difference between real time and Utils.now() so that test-cases can use a mock clock.
}, new Date(channel.expiryTimeSeconds() * 1000 + (System.currentTimeMillis() - Utils.currentTimeMillis())));

8
core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java
View File

@@ -190,7 +190,13 @@ public class StoredPaymentChannelServerStates implements WalletExtension {
@Override
public void run() {
log.info("Auto-closing channel: {}", channel);
closeChannel(channel);
try {
closeChannel(channel);
} catch (Exception e) {
// Something went wrong closing the channel - we catch
// here or else we take down the whole Timer.
log.error("Auto-closing channel failed", e);
}
}
}, autocloseTime);
} finally {