From 690e3d17c56a7b9f584f0eed4031e4a0aab84170 Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Fri, 28 Sep 2018 20:16:03 +0200
Subject: [PATCH] use final variables in store request
---
.../bramble/mailbox/protocol/MailboxRequestStore.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxRequestStore.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxRequestStore.java
index 60074e1c3..6af101708 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxRequestStore.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxRequestStore.java
@@ -9,8 +9,8 @@ import javax.annotation.Nullable;
import static org.briarproject.bramble.mailbox.protocol.MailboxMessage.TYPE.STORE;
public class MailboxRequestStore extends MailboxRequest {
- private ContactId contactId;
- private byte[] encryptedSyncStream;
+ private final ContactId contactId;
+ private final byte[] encryptedSyncStream;
public MailboxRequestStore(ContactId contactId,
byte[] encryptedSyncMessage) {
@@ -30,7 +30,7 @@ public class MailboxRequestStore extends MailboxRequest {
BdfList body = msg.getList(2);
- if(body.size() > 2)
+ if (body.size() != 2)
throw new FormatException();
Long cId = body.getOptionalLong(0);
@@ -38,7 +38,8 @@ public class MailboxRequestStore extends MailboxRequest {
if (cId > Integer.MAX_VALUE || cId < Integer.MIN_VALUE)
throw new FormatException();
contactId = new ContactId(cId.intValue());
- }
+ } else
+ contactId = null;
encryptedSyncStream = body.getRaw(1);
}
--
GitLab