From 330889a4393d814fc83e76c741e9e4fcd88cb665 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 27 Feb 2013 18:09:49 +0000
Subject: [PATCH] Fixed an ambiguous column name and erroneous javadoc
comments.
---
briar-core/src/net/sf/briar/db/Database.java | 5 ++---
briar-core/src/net/sf/briar/db/JdbcDatabase.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/briar-core/src/net/sf/briar/db/Database.java b/briar-core/src/net/sf/briar/db/Database.java
index 43a91fa56b..7fd09fa9a1 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 f907d7a37b..0ea09d93dd 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";
--
GitLab