Improve the error when trying to delete the registrant contact

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=196708902
This commit is contained in:
guyben 2018-05-15 12:13:39 -07:00 committed by jianglai
parent 25d03f239c
commit e4f25c08e8
5 changed files with 55 additions and 1 deletions

View file

@ -27,6 +27,7 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
import static google.registry.util.CollectionUtils.union;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key;
@ -387,7 +388,7 @@ public class DomainCommand {
/** Creates a copy of this {@link Change} with hard links to hosts and contacts. */
Change cloneAndLinkReferences(DateTime now) throws InvalidReferencesException {
Change clone = clone(this);
clone.registrant = clone.registrantContactId == null
clone.registrant = Strings.isNullOrEmpty(clone.registrantContactId)
? null
: getOnlyElement(
loadByForeignKeys(