bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Christian Basler
2016-02-26 16:30:45 +01:00
parent 9ca28ead66
commit 57057298a1
4 changed files with 80 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
View File

@ -61,11 +61,12 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
if (cache.get(stream) == null) {
result = new ConcurrentHashMap<>();
cache.put(stream, result);
try (Connection connection = config.getConnection()) {
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery("SELECT hash, expires FROM Inventory WHERE expires > "
+ now(-5 * MINUTE) + " AND stream = " + stream);
try (
Connection connection = config.getConnection();
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery("SELECT hash, expires FROM Inventory " +
"WHERE expires > " + now(-5 * MINUTE) + " AND stream = " + stream)
) {
while (rs.next()) {
result.put(new InventoryVector(rs.getBytes("hash")), rs.getLong("expires"));
}
@ -116,7 +117,7 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
query.append(" AND version = ").append(version);
}
if (types.length > 0) {
query.append(" AND type IN (").append(join(types)).append(")");
query.append(" AND type IN (").append(join(types)).append(')');
}
try (
Connection connection = config.getConnection();