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 fff9bfa826c..7cb5ca5107c 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java @@ -70,7 +70,6 @@ import google.registry.flows.EppException.StatusProhibitsOperationException; import google.registry.flows.EppException.UnimplementedOptionException; import google.registry.flows.exceptions.ResourceHasClientUpdateProhibitedException; -import google.registry.model.EppResource; import google.registry.model.billing.BillingBase.Flag; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingRecurrence; @@ -410,11 +409,9 @@ static Period verifyUnitIsYears(Period period) throws EppException { /** Verify that no linked nameservers have disallowed statuses. */ static void verifyNotInPendingDelete(ImmutableSet> nameservers) throws StatusProhibitsOperationException { - for (EppResource resource : - EppResource.loadByCacheIfEnabled(ImmutableSet.copyOf(nameservers)).values()) { - if (resource.getStatusValues().contains(StatusValue.PENDING_DELETE)) { - throw new LinkedResourceInPendingDeleteProhibitsOperationException( - resource.getForeignKey()); + for (Host host : tm().loadByKeys(nameservers).values()) { + if (host.getStatusValues().contains(StatusValue.PENDING_DELETE)) { + throw new LinkedResourceInPendingDeleteProhibitsOperationException(host.getForeignKey()); } } }