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

Fixed NullPointerException

Browse Source
This commit is contained in:
Christian Basler
2017-05-16 17:20:52 +02:00
parent 956ed61b14
commit 239c6ec7f4
9 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
"WHERE expires > " + now(-5 * MINUTE) + " AND stream = " + stream)
) {
while (rs.next()) {
result.put(new InventoryVector(rs.getBytes("hash")), rs.getLong("expires"));
result.put(InventoryVector.fromHash(rs.getBytes("hash")), rs.getLong("expires"));
}
} catch (SQLException e) {
LOG.error(e.getMessage(), e);

2
repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
View File

@ -110,7 +110,7 @@ public class JdbcMessageRepository extends AbstractMessageRepository implements
Plaintext.Builder builder = Plaintext.readWithoutSignature(type, data);
long id = rs.getLong("id");
builder.id(id);
builder.IV(new InventoryVector(iv));
builder.IV(InventoryVector.fromHash(iv));
builder.from(ctx.getAddressRepository().getAddress(rs.getString("sender")));
builder.to(ctx.getAddressRepository().getAddress(rs.getString("recipient")));
builder.ackData(rs.getBytes("ack_data"));