From 45a51b49260cd919a644b9831aabf7fbb46aca6f Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 6 Dec 2011 10:58:26 +0000
Subject: [PATCH] ExceptionHandler interface.
---
api/net/sf/briar/api/ExceptionHandler.java | 6 ++++++
api/net/sf/briar/api/transport/ConnectionRecogniser.java | 5 ++---
.../net/sf/briar/transport/ConnectionDispatcherImpl.java | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 api/net/sf/briar/api/ExceptionHandler.java
diff --git a/api/net/sf/briar/api/ExceptionHandler.java b/api/net/sf/briar/api/ExceptionHandler.java
new file mode 100644
index 0000000000..ccc91d094e
--- /dev/null
+++ b/api/net/sf/briar/api/ExceptionHandler.java
@@ -0,0 +1,6 @@
+package net.sf.briar.api;
+
+public interface ExceptionHandler<E extends Exception> {
+
+ void handleException(E exception);
+}
diff --git a/api/net/sf/briar/api/transport/ConnectionRecogniser.java b/api/net/sf/briar/api/transport/ConnectionRecogniser.java
index 7e23e370ab..aa448648c5 100644
--- a/api/net/sf/briar/api/transport/ConnectionRecogniser.java
+++ b/api/net/sf/briar/api/transport/ConnectionRecogniser.java
@@ -1,5 +1,6 @@
package net.sf.briar.api.transport;
+import net.sf.briar.api.ExceptionHandler;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.protocol.TransportId;
@@ -15,12 +16,10 @@ public interface ConnectionRecogniser {
*/
void acceptConnection(TransportId t, byte[] tag, Callback c);
- interface Callback {
+ interface Callback extends ExceptionHandler<DbException> {
void connectionAccepted(ConnectionContext ctx);
void connectionRejected();
-
- void handleException(DbException e);
}
}
diff --git a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
index e2a49f6bd7..1415e242e8 100644
--- a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
+++ b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
@@ -58,7 +58,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
}
public void connectionRejected() {
- r.dispose(false);
+ r.dispose(true);
}
public void handleException(DbException e) {
@@ -103,7 +103,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
}
public void connectionRejected() {
- s.dispose(false);
+ s.dispose(true);
}
public void handleException(DbException e) {
--
GitLab