opendev/gerrit
Code Issues Proposed changes

Fix NPE when writing reflog for refs/meta/config changes

Browse Source 
Change-Id: I58b5aa15f9a00486cad6e73442ad9d49810037e6
This commit is contained in:
David Pursehouse
2015-01-22 18:46:17 +09:00
parent 1dee7265f1
commit be09512df9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
View File

@@ -345,8 +345,12 @@ public abstract class VersionedMetaData {
ru.setExpectedOldObjectId(oldId);
ru.setNewObjectId(src);
ru.setRefLogIdent(update.getCommitBuilder().getAuthor());
String message = update.getCommitBuilder().getMessage();
if (message == null) {
message = "meta data update";
}
try (BufferedReader reader = new BufferedReader(
new StringReader(update.getCommitBuilder().getMessage()))) {
new StringReader(message))) {
// read the subject line and use it as reflog message
ru.setRefLogMessage("commit: " + reader.readLine(), true);
}