From c4b1c18fc2b703914ec7d0db19c8b6cad0cec2d9 Mon Sep 17 00:00:00 2001
From: Jens Schauder <jens.schauder@broadcom.com>
Date: Mon, 21 Oct 2024 14:41:09 +0200
Subject: [PATCH] Sort revisions by timestamp and revision number.

Sorting by revision number alone failed for distributed systems using batched sequences for revision numbers.

Closes #3643
See #3579
---
 .../envers/repository/support/EnversRevisionRepositoryImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
index 30e4ff2ecc..7a6c1b62a3 100755
--- a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
+++ b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
@@ -96,6 +96,7 @@ public EnversRevisionRepositoryImpl(JpaEntityInformation<T, ?> entityInformation
 	public Optional<Revision<N, T>> findLastChangeRevision(ID id) {
 
 		List<Object[]> singleResult = createBaseQuery(id) //
+				.addOrder(AuditEntity.revisionProperty("timestamp").desc()) //
 				.addOrder(AuditEntity.revisionNumber().desc()) //
 				.setMaxResults(1) //
 				.getResultList();