From 1bc3d52957b642695394451a4d146a2883be9618 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 14 Dec 2012 20:19:53 +0000
Subject: [PATCH] If an exception occurs during fast retransmission, propagate
it.
---
.../src/net/sf/briar/plugins/modem/Sender.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/briar-core/src/net/sf/briar/plugins/modem/Sender.java b/briar-core/src/net/sf/briar/plugins/modem/Sender.java
index 4c9018db52..3bf2c75f5b 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/Sender.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/Sender.java
@@ -43,7 +43,7 @@ class Sender {
writeHandler.handleWrite(a.getBuffer());
}
- void handleAck(byte[] b) {
+ void handleAck(byte[] b) throws IOException {
if(b.length != Ack.LENGTH) {
// Ignore ack frame with invalid length
return;
@@ -95,15 +95,8 @@ class Sender {
if(windowSize > oldWindowSize || foundIndex != -1) notifyAll();
}
// Fast retransmission
- if(fastRetransmit != null) {
- Data d = fastRetransmit.data;
- try {
- writeHandler.handleWrite(d.getBuffer());
- } catch(IOException e) {
- // FIXME: Do something more meaningful
- if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
- }
- }
+ if(fastRetransmit != null)
+ writeHandler.handleWrite(fastRetransmit.data.getBuffer());
}
void tick() {
--
GitLab