From 1a5eb40fb5b68b088190ee9661fcf0e1fb043cda Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Fri, 19 May 2023 14:21:48 -0400 Subject: [PATCH] Wrap tm().loadByKey() in a transaction when caching is not enabled. (#2030) We have caching enabled so we never exercised this line. --- core/src/main/java/google/registry/model/EppResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/google/registry/model/EppResource.java b/core/src/main/java/google/registry/model/EppResource.java index 33fd2212f..cb7a56497 100644 --- a/core/src/main/java/google/registry/model/EppResource.java +++ b/core/src/main/java/google/registry/model/EppResource.java @@ -403,7 +403,7 @@ public abstract class EppResource extends UpdateAutoTimestampEntity implements B public static ImmutableMap, EppResource> loadCached( Iterable> keys) { if (!RegistryConfig.isEppResourceCachingEnabled()) { - return tm().loadByKeys(keys); + return tm().transact(() -> tm().loadByKeys(keys)); } return ImmutableMap.copyOf(cacheEppResources.getAll(keys)); } @@ -416,7 +416,7 @@ public abstract class EppResource extends UpdateAutoTimestampEntity implements B */ public static T loadCached(VKey key) { if (!RegistryConfig.isEppResourceCachingEnabled()) { - return tm().loadByKey(key); + return tm().transact(() -> tm().loadByKey(key)); } // Safe to cast because loading a Key returns an entity of type T. @SuppressWarnings("unchecked")