diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-07-02 12:36:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-02 12:36:28 +0000 |
| commit | 4318e68ef6dfc37370a3ff5f8213978f0b7498bc (patch) | |
| tree | 36c2667d4737630a3d92d377cd495e80f47d4ea3 | |
| parent | e32f360238811dc0a45214b9dc6a05aeceef8451 (diff) | |
| parent | 7bd1244b2c4a397af95a43eb619d549a6bc9653b (diff) | |
Merge "Avoid NPE in get related changes" into stable-2.11
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java index 6cdae44bbc..0144b94d7b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java @@ -116,7 +116,10 @@ public class GetRelated implements RestReadView<RevisionResource> { PatchSet p = commits.get(c.name()); Change g = null; if (p != null) { - g = changes.get(p.getId().getParentKey()).change(); + ChangeData cd = changes.get(p.getId().getParentKey()); + if (cd != null) { + g = cd.change(); + } added.add(p.getId().getParentKey()); } parents.add(new ChangeAndCommit(g, p, c)); |