Merge pull request #619 from JPWatson/segement-length

Fix segment length in Catalog
real-logic · Jan 24, 2019 · 1b1e726 · 1b1e726
2 parents 7ec1035 + 515b6dd
commit 1b1e726
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/aeron-archive/src/main/java/io/aeron/archive/ArchiveConductor.java b/aeron-archive/src/main/java/io/aeron/archive/ArchiveConductor.java
@@ -771,12 +771,13 @@ private void startRecordingSession(
         final int mtuLength = image.mtuLength();
         final int initialTermId = image.initialTermId();
         final long startPosition = image.joinPosition();
+        final int segmentFileLength = Math.max(ctx.segmentFileLength(), termBufferLength);
 
         final long recordingId = catalog.addNewRecording(
             startPosition,
             cachedEpochClock.time(),
             initialTermId,
-            ctx.segmentFileLength(),
+            segmentFileLength,
             termBufferLength,
             mtuLength,
             sessionId,
@@ -792,7 +793,7 @@ private void startRecordingSession(
         final RecordingSession session = new RecordingSession(
             recordingId,
             startPosition,
-            Math.max(ctx.segmentFileLength(), termBufferLength),
+            segmentFileLength,
             originalChannel,
             recordingEventsProxy,
             image,