Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Fixed an ambiguous column name and erroneous javadoc comments.

Browse Source
This commit is contained in:
akwizgran
2013-02-27 18:09:49 +00:00
parent 1e8a8d985d
commit 330889a439
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-core/src/net/sf/briar/db/Database.java
View File

@@ -242,7 +242,7 @@ interface Database<T> {
/** /**
* Returns the time at which a connection to the given contact was last * Returns the time at which a connection to the given contact was last
* opened or closed. * made.
* <p> * <p>
* Locking: contact read, window read. * Locking: contact read, window read.
*/ */
@@ -597,8 +597,7 @@ interface Database<T> {
long centre, byte[] bitmap) throws DbException; long centre, byte[] bitmap) throws DbException;
/** /**
* Sets the time at which a connection to the given contact was last * Sets the time at which a connection to the given contact was last made.
* opened or closed.
* <p> * <p>
* Locking: contact read, window write. * Locking: contact read, window write.
*/ */

2
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -1052,7 +1052,7 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null; PreparedStatement ps = null;
ResultSet rs = null; ResultSet rs = null;
try { try {
String sql = "SELECT contactId, name, lastConnected" String sql = "SELECT c.contactId, name, lastConnected"
+ " FROM contacts AS c" + " FROM contacts AS c"
+ " JOIN connectionTimes AS ct" + " JOIN connectionTimes AS ct"
+ " ON c.contactId = ct.contactId"; + " ON c.contactId = ct.contactId";