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

Merge branch '664-no-delivery-hook' into 'master'

Browse Source 
Don't throw an exception if the client has no delivery hook

Closes #664.

See merge request !318
This commit is contained in:
Torsten Grote
2016-09-16 23:41:53 +00:00
parent cc439aa74f 16ac73d002
commit bf023874f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/org/briarproject/sync/ValidationManagerImpl.java
View File

@@ -339,9 +339,9 @@ class ValidationManagerImpl implements ValidationManager, Service,
private boolean deliverMessage(Transaction txn, Message m, ClientId c,
Metadata meta) throws DbException {
// Deliver the message to the client if it's registered a hook
IncomingMessageHook hook = hooks.get(c);
if (hook == null) throw new DbException();
hook.incomingMessage(txn, m, meta);
if (hook != null) hook.incomingMessage(txn, m, meta);
// TODO: Find a better way for clients to signal validity, #643
if (db.getRawMessage(txn, m.getId()) == null) {
db.setMessageState(txn, m.getId(), INVALID);