diff --git a/briar-core/src/net/sf/briar/db/Database.java b/briar-core/src/net/sf/briar/db/Database.java index 43a91fa56b4de64d43c89ea211f321685319f095..7fd09fa9a1856bd80dab1142abf66c2b234f0d98 100644 --- a/briar-core/src/net/sf/briar/db/Database.java +++ b/briar-core/src/net/sf/briar/db/Database.java @@ -242,7 +242,7 @@ interface Database<T> { /** * Returns the time at which a connection to the given contact was last - * opened or closed. + * made. * <p> * Locking: contact read, window read. */ @@ -597,8 +597,7 @@ interface Database<T> { long centre, byte[] bitmap) throws DbException; /** - * Sets the time at which a connection to the given contact was last - * opened or closed. + * Sets the time at which a connection to the given contact was last made. * <p> * Locking: contact read, window write. */ diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java index f907d7a37bd483aaf4c2b6e0c8d1a513cf8c3bf1..0ea09d93ddf8585ba28f30e2904bb010afc69cb8 100644 --- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java +++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java @@ -1052,7 +1052,7 @@ abstract class JdbcDatabase implements Database<Connection> { PreparedStatement ps = null; ResultSet rs = null; try { - String sql = "SELECT contactId, name, lastConnected" + String sql = "SELECT c.contactId, name, lastConnected" + " FROM contacts AS c" + " JOIN connectionTimes AS ct" + " ON c.contactId = ct.contactId";