From 84b34048ba8d092fac3ef41cfb2a0cec22545971 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 9 Apr 2013 20:13:59 +0100
Subject: [PATCH] Don't make empty offers.
---
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
index ea68dd7f10..b723cc1270 100644
--- a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
@@ -714,6 +714,7 @@ DatabaseCleaner.Callback {
} finally {
contactLock.readLock().unlock();
}
+ if(offered.isEmpty()) return null;
return new Offer(offered);
}
@@ -1369,7 +1370,10 @@ DatabaseCleaner.Callback {
throw new NoSuchTransportException();
long counter = db.incrementConnectionCounter(txn, c, t,
period);
- db.setLastConnected(txn, c, clock.currentTimeMillis());
+ if(counter != -1) {
+ long now = clock.currentTimeMillis();
+ db.setLastConnected(txn, c, now);
+ }
db.commitTransaction(txn);
return counter;
} catch(DbException e) {
--
GitLab