fixed https://github.com/ChronicleEnterprise/Chronicle-Queue-Enterpri…

…se/issues/23
OpenHFT · Jan 23, 2018 · 18e26cd · 18e26cd
1 parent ee46aaf
commit 18e26cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
             <dependency>
                 <groupId>net.openhft</groupId>
                 <artifactId>chronicle-bom</artifactId>
-                <version>1.15.59</version>
+                <version>1.15.61-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueExcerpts.java b/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueExcerpts.java
@@ -1886,11 +1886,11 @@ public long lastAcknowledgedIndexReplicated() throws EOFException {
             }
         }
 
-        public  long lastIndexReplicated(final long index) {
+        public void lastIndexReplicated(final long index) {
             // the reason that we use the temp tailer is to prevent this tailer from having its cycle changed
             final StoreTailer temp = (StoreTailer) queue.acquireTailer().toEnd();
             try {
-                return temp.store.lastIndexReplicated();
+                temp.store.lastIndexReplicated(index);
             } finally {
                 temp.release();
             }

diff --git a/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueStore.java b/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueStore.java
@@ -23,7 +23,6 @@
 import net.openhft.chronicle.core.ReferenceCounter;
 import net.openhft.chronicle.core.annotation.UsedViaReflection;
 import net.openhft.chronicle.core.pool.ClassAliasPool;
-import net.openhft.chronicle.core.values.BooleanValue;
 import net.openhft.chronicle.core.values.LongValue;
 import net.openhft.chronicle.core.values.TwoLongValue;
 import net.openhft.chronicle.queue.RollCycle;
@@ -401,12 +400,8 @@ public void writeMarshallable(@NotNull WireOut wire) {
                 .int64forBinding(-1L, lastAcknowledgedIndexReplicated);
         wire.write(MetaDataField.recovery).typedMarshallable(recovery);
         wire.write(MetaDataField.deltaCheckpointInterval).int32(this.deltaCheckpointInterval);
-
-        if (Boolean.getBoolean("includeQueueHeaderField-lastIndexReplicated-and-sourceId")) {
-            wire.write(MetaDataField.lastIndexReplicated).int64forBinding(-1L, lastIndexReplicated);
-            wire.write(MetaDataField.sourceId).int32(sourceId);
-        }
-
+        wire.write(MetaDataField.lastIndexReplicated).int64forBinding(-1L, lastIndexReplicated);
+        wire.write(MetaDataField.sourceId).int32(sourceId);
         wire.padToCacheAlign();
     }