zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-29 19:47:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Wrap tm().loadByKey() in a transaction when caching is not enabled. (#2030)

Browse source 
We have caching enabled so we never exercised this line.
This commit is contained in:
Lai Jiang 2023-05-19 14:21:48 -04:00 • committed by GitHub
parent 811fcf9f43
commit 1a5eb40fb5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/google/registry/model/EppResource.java
View file

@ -403,7 +403,7 @@ public abstract class EppResource extends UpdateAutoTimestampEntity implements B
public static ImmutableMap<VKey<? extends EppResource>, EppResource> loadCached( public static ImmutableMap<VKey<? extends EppResource>, EppResource> loadCached(
Iterable<VKey<? extends EppResource>> keys) { Iterable<VKey<? extends EppResource>> keys) {
if (!RegistryConfig.isEppResourceCachingEnabled()) { if (!RegistryConfig.isEppResourceCachingEnabled()) {
return tm().loadByKeys(keys); return tm().transact(() -> tm().loadByKeys(keys));
} }
return ImmutableMap.copyOf(cacheEppResources.getAll(keys)); return ImmutableMap.copyOf(cacheEppResources.getAll(keys));
} }
@ -416,7 +416,7 @@ public abstract class EppResource extends UpdateAutoTimestampEntity implements B
*/ */
public static <T extends EppResource> T loadCached(VKey<T> key) { public static <T extends EppResource> T loadCached(VKey<T> key) {
if (!RegistryConfig.isEppResourceCachingEnabled()) { if (!RegistryConfig.isEppResourceCachingEnabled()) {
return tm().loadByKey(key); return tm().transact(() -> tm().loadByKey(key));
} }
// Safe to cast because loading a Key<T> returns an entity of type T. // Safe to cast because loading a Key<T> returns an entity of type T.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")