From be09512df9f2884ca6371e3f22724659e33da7a5 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Thu, 22 Jan 2015 18:46:17 +0900
Subject: [PATCH] Fix NPE when writing reflog for refs/meta/config changes

Change-Id: I58b5aa15f9a00486cad6e73442ad9d49810037e6
---
 .../com/google/gerrit/server/git/VersionedMetaData.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
index 7f07e232b2..8dab448762 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
@@ -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);
         }