Commit 00bc8ac7 authored by akwizgran's avatar akwizgran

Include handshake keys when loading all local authors.

parent 75776eb7
...@@ -1782,7 +1782,8 @@ abstract class JdbcDatabase implements Database<Connection> { ...@@ -1782,7 +1782,8 @@ abstract class JdbcDatabase implements Database<Connection> {
ResultSet rs = null; ResultSet rs = null;
try { try {
String sql = "SELECT authorId, formatVersion, name, publicKey," String sql = "SELECT authorId, formatVersion, name, publicKey,"
+ " privateKey, created" + " privateKey, handshakePublicKey, handshakePrivateKey,"
+ " created"
+ " FROM localAuthors"; + " FROM localAuthors";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
rs = ps.executeQuery(); rs = ps.executeQuery();
...@@ -1793,9 +1794,12 @@ abstract class JdbcDatabase implements Database<Connection> { ...@@ -1793,9 +1794,12 @@ abstract class JdbcDatabase implements Database<Connection> {
String name = rs.getString(3); String name = rs.getString(3);
byte[] publicKey = rs.getBytes(4); byte[] publicKey = rs.getBytes(4);
byte[] privateKey = rs.getBytes(5); byte[] privateKey = rs.getBytes(5);
long created = rs.getLong(6); byte[] handshakePublicKey = rs.getBytes(6);
byte[] handshakePrivateKey = rs.getBytes(7);
long created = rs.getLong(8);
authors.add(new LocalAuthor(authorId, formatVersion, name, authors.add(new LocalAuthor(authorId, formatVersion, name,
publicKey, privateKey, created)); publicKey, privateKey, handshakePublicKey,
handshakePrivateKey, created));
} }
rs.close(); rs.close();
ps.close(); ps.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment