zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix Kokoro failure

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=246411007
This commit is contained in:
guyben 2019-05-02 16:14:50 -07:00 • committed by jianglai
parent 625e613b07
commit 5962c9c561
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
java/google/registry/rdap/AbstractJsonableObject.java
View file

@ -35,6 +35,7 @@ import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
@ -468,8 +469,10 @@ abstract class AbstractJsonableObject implements Jsonable {
}
private void mergeWith(JsonObject otherJsonObject, Member member) {
for (String name : otherJsonObject.keySet()) {
JsonElement otherElement = otherJsonObject.get(name);
for (Map.Entry<String, JsonElement> entry : otherJsonObject.entrySet()) {
String name = entry.getKey();
JsonElement otherElement = entry.getValue();
JsonElement ourElement = jsonObject.get(name);
if (ourElement == null) {
jsonObject.add(name, otherElement);