diff --git a/core/src/main/java/google/registry/tools/UpdateRecurrenceCommand.java b/core/src/main/java/google/registry/tools/UpdateRecurrenceCommand.java index 857e7c35f..a8cfbaa2f 100644 --- a/core/src/main/java/google/registry/tools/UpdateRecurrenceCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateRecurrenceCommand.java @@ -30,6 +30,7 @@ import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; +import google.registry.model.transfer.TransferStatus; import java.util.List; import java.util.Optional; import javax.annotation.Nullable; @@ -174,7 +175,8 @@ public class UpdateRecurrenceCommand extends ConfirmingCommand { "Domain %s has already had a deletion time set", domainName); checkArgument( - domain.getTransferData().isEmpty(), + domain.getTransferData().isEmpty() + || domain.getTransferData().getTransferStatus() != TransferStatus.PENDING, "Domain %s has a pending transfer: %s", domainName, domain.getTransferData()); diff --git a/core/src/test/java/google/registry/tools/UpdateRecurrenceCommandTest.java b/core/src/test/java/google/registry/tools/UpdateRecurrenceCommandTest.java index 9e9dc853d..846e71d1a 100644 --- a/core/src/test/java/google/registry/tools/UpdateRecurrenceCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateRecurrenceCommandTest.java @@ -33,6 +33,8 @@ import google.registry.model.billing.BillingRecurrence; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.DomainTransferData; +import google.registry.model.transfer.TransferStatus; import java.util.Optional; import javax.annotation.Nullable; import org.joda.money.CurrencyUnit; @@ -121,6 +123,25 @@ public class UpdateRecurrenceCommandTest extends CommandTestCase