diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java index aff519abfa..024fef4f48 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java @@ -87,6 +87,14 @@ public class PatchFile { } } + private String getOldName() { + String name = entry.getOldName(); + if (name != null) { + return name; + } + return entry.getNewName(); + } + /** * Extract a line from the file, as a string. * @@ -100,7 +108,7 @@ public class PatchFile { switch (file) { case 0: if (a == null) { - a = load(aTree, entry.getOldName()); + a = load(aTree, getOldName()); } return a.getString(line - 1); @@ -127,7 +135,7 @@ public class PatchFile { switch (file) { case 0: if (a == null) { - a = load(aTree, entry.getOldName()); + a = load(aTree, getOldName()); } return a.size(); |