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

Return transports that have no properties.

Browse Source
This commit is contained in:
akwizgran
2011-11-15 09:00:51 +00:00
parent 72be34768b
commit 2ad15518a5
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/net/sf/briar/db/JdbcDatabase.java
View File

@@ -1454,10 +1454,13 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null;
ResultSet rs = null;
try {
String sql = "SELECT contactId, key, value"
+ " FROM contactTransportProperties"
+ " WHERE transportId = ?"
+ " ORDER BY contactId";
String sql = "SELECT contactTransports.contactId, key, value"
+ " FROM contactTransports"
+ " LEFT OUTER JOIN contactTransportProperties"
+ " ON contactTransports.transportId"
+ " = contactTransportProperties.transportId"
+ " WHERE contactTransports.transportId = ?"
+ " ORDER BY contactTransports.contactId";
ps = txn.prepareStatement(sql);
ps.setBytes(1, t.getBytes());
rs = ps.executeQuery();
@@ -1471,7 +1474,10 @@ abstract class JdbcDatabase implements Database<Connection> {
p = new TransportProperties();
properties.put(id, p);
}
p.put(rs.getString(2), rs.getString(3));
// Key and value may be null due to the left outer join
String key = rs.getString(2);
String value = rs.getString(3);
if(key != null && value != null) p.put(key, value);
}
rs.close();
ps.close();