mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-06-09 08:22:59 +00:00
Code Issues Releases Wiki Activity

Use merge instead of persist for RegistryLockDao (#310)

Browse Source 
* Use merge instead of persist for RegistryLockDao

* CR responses
This commit is contained in:
gbrodman
2019-10-22 12:21:32 -07:00
committed by GitHub
parent 128fde16c3
commit f98b0f8739
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/google/registry/model/registry/RegistryLockDao.java
View File

@@ -45,8 +45,8 @@ public final class RegistryLockDao {
});
}
public static void save(RegistryLock registryLock) {
public static RegistryLock save(RegistryLock registryLock) {
checkNotNull(registryLock, "Null registry lock cannot be saved");
jpaTm().transact(() -> jpaTm().getEntityManager().persist(registryLock));
return jpaTm().transact(() -> jpaTm().getEntityManager().merge(registryLock));
}
}

5
core/src/main/java/google/registry/schema/domain/RegistryLock.java
View File

@@ -177,10 +177,7 @@ public final class RegistryLock extends ImmutableObject implements Buildable {
@Override
public Builder asBuilder() {
RegistryLock clone = clone(this);
// Revision ID should be different for every object
clone.revisionId = null;
return new Builder(clone);
return new Builder(clone(this));
}
/** Builder for {@link google.registry.schema.domain.RegistryLock}. */