From d46594c610f71ae856473cc810b6d9e90d538e44 Mon Sep 17 00:00:00 2001 From: gbrodman Date: Fri, 3 Sep 2021 09:25:53 -0600 Subject: [PATCH] Select correct history entries when creating canceling records (#1309) --- .../java/google/registry/flows/domain/DomainFlowUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java index 2ada79a78..c2e2ec563 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java @@ -1097,10 +1097,11 @@ public class DomainFlowUtils { } else { return jpaTm() .query( - "FROM DomainHistory WHERE modificationTime >= :beginning " - + "ORDER BY modificationTime ASC", + "FROM DomainHistory WHERE modificationTime >= :beginning AND domainRepoId = " + + ":repoId ORDER BY modificationTime ASC", DomainHistory.class) .setParameter("beginning", now.minus(maxSearchPeriod)) + .setParameter("repoId", domainBase.getRepoId()) .getResultList(); } }