From 09585704054efc5e51097eb4228b642f8cdfc1ee Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Tue, 9 Apr 2013 21:02:37 +0100 Subject: [PATCH] Fixed invalid column indices - unit tests would have caught them. --- briar-core/src/net/sf/briar/db/JdbcDatabase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java index d1ccf16bf9..a456bcdbb8 100644 --- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java +++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java @@ -1605,7 +1605,7 @@ abstract class JdbcDatabase implements Database<Connection> { ps.setInt(3, maxMessages); rs = ps.executeQuery(); List<MessageId> ids = new ArrayList<MessageId>(); - while(rs.next()) ids.add(new MessageId(rs.getBytes(2))); + while(rs.next()) ids.add(new MessageId(rs.getBytes(1))); rs.close(); ps.close(); if(ids.size() == maxMessages) @@ -1632,7 +1632,7 @@ abstract class JdbcDatabase implements Database<Connection> { ps.setLong(2, now); ps.setInt(3, maxMessages - ids.size()); rs = ps.executeQuery(); - while(rs.next()) ids.add(new MessageId(rs.getBytes(2))); + while(rs.next()) ids.add(new MessageId(rs.getBytes(1))); rs.close(); ps.close(); return Collections.unmodifiableList(ids); -- GitLab