fix(broker-core): fix offset assert in messages

camunda · Sep 19, 2018 · efa4d56 · efa4d56
1 parent 8d344e9
commit efa4d56
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/broker-core/src/main/java/io/zeebe/broker/subscription/message/state/Message.java b/broker-core/src/main/java/io/zeebe/broker/subscription/message/state/Message.java
@@ -137,25 +137,28 @@ public int getLength() {
 
   @Override
   public void write(final MutableDirectBuffer buffer, int offset) {
-    offset = writeIntoBuffer(buffer, offset, name);
-    offset = writeIntoBuffer(buffer, offset, correlationKey);
-    offset = writeIntoBuffer(buffer, offset, payload);
-    offset = writeIntoBuffer(buffer, offset, id);
+    int valueOffset = offset;
+    valueOffset = writeIntoBuffer(buffer, valueOffset, name);
+    valueOffset = writeIntoBuffer(buffer, valueOffset, correlationKey);
+    valueOffset = writeIntoBuffer(buffer, valueOffset, payload);
+    valueOffset = writeIntoBuffer(buffer, valueOffset, id);
 
-    buffer.putLong(offset, timeToLive, ByteOrder.LITTLE_ENDIAN);
-    offset += Long.BYTES;
-    buffer.putLong(offset, deadline, ByteOrder.LITTLE_ENDIAN);
-    offset += Long.BYTES;
-    buffer.putLong(offset, key, ByteOrder.LITTLE_ENDIAN);
-    offset += Long.BYTES;
-    assert offset == getLength() : "End offset differs with getLength()";
+    buffer.putLong(valueOffset, timeToLive, ByteOrder.LITTLE_ENDIAN);
+    valueOffset += Long.BYTES;
+    buffer.putLong(valueOffset, deadline, ByteOrder.LITTLE_ENDIAN);
+    valueOffset += Long.BYTES;
+    buffer.putLong(valueOffset, key, ByteOrder.LITTLE_ENDIAN);
+    valueOffset += Long.BYTES;
+    assert (valueOffset - offset) == getLength() : "End offset differs with getLength()";
   }
 
   public void writeKey(MutableDirectBuffer keyBuffer, int offset) {
-    keyBuffer.putLong(offset, deadline, ByteOrder.LITTLE_ENDIAN);
-    offset += Long.BYTES;
-    offset = writeMessageKeyToBuffer(keyBuffer, offset, name, correlationKey);
-    assert offset == getKeyLength() : "Offset problem: offset is not equal to expected key length";
+    int keyOffset = offset;
+    keyBuffer.putLong(keyOffset, deadline, ByteOrder.LITTLE_ENDIAN);
+    keyOffset += Long.BYTES;
+    keyOffset = writeMessageKeyToBuffer(keyBuffer, keyOffset, name, correlationKey);
+    assert (keyOffset - offset) == getKeyLength()
+        : "Offset problem: offset is not equal to expected key length";
   }
 
   public static int writeMessageKeyToBuffer(