diff --git a/replicator/src/main/scala/com/evolutiongaming/kafka/journal/replicator/Batch.scala b/replicator/src/main/scala/com/evolutiongaming/kafka/journal/replicator/Batch.scala index 2c4b3d62e..91f8c3898 100644 --- a/replicator/src/main/scala/com/evolutiongaming/kafka/journal/replicator/Batch.scala +++ b/replicator/src/main/scala/com/evolutiongaming/kafka/journal/replicator/Batch.scala @@ -84,12 +84,9 @@ private[journal] object Batch { val deleteTo = this.delete.map(_.to.value) val records = appends.records val actions = - if (deleteTo.contains(records.head.action.range.to) && records.tail.nonEmpty) appends.records.tail - else appends.records.toList - NonEmptyList.fromList(actions) match { - case Some(actions) => appends.copy(records = actions).some - case None => appends.some // cannot happen - } + if (deleteTo.contains(records.head.action.range.to)) NonEmptyList.fromList(records.tail).getOrElse(records) + else records + appends.copy(records = actions).some } }