Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Fix NPE when removing refs
Change-Id: I008818c839a48a68e05b40879a444bb14a332b8f
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/Log4jSharedRefLogger.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/Log4jSharedRefLogger.java
index b5d20e0..4a844f7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/Log4jSharedRefLogger.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/Log4jSharedRefLogger.java
@@ -64,17 +64,19 @@
RevWalk walk = new RevWalk(repository)) {
GitPerson committer = null;
String commitMessage = null;
- int objectType = walk.parseAny(newRefValue).getType();
- switch (objectType) {
- case OBJ_COMMIT:
- RevCommit commit = walk.parseCommit(newRefValue);
- committer = CommonConverters.toGitPerson(commit.getCommitterIdent());
- commitMessage = commit.getShortMessage();
- break;
- case OBJ_BLOB:
- break;
- default:
- throw new IncorrectObjectTypeException(newRefValue, Constants.typeString(objectType));
+ if (newRefValue != null) {
+ int objectType = walk.parseAny(newRefValue).getType();
+ switch (objectType) {
+ case OBJ_COMMIT:
+ RevCommit commit = walk.parseCommit(newRefValue);
+ committer = CommonConverters.toGitPerson(commit.getCommitterIdent());
+ commitMessage = commit.getShortMessage();
+ break;
+ case OBJ_BLOB:
+ break;
+ default:
+ throw new IncorrectObjectTypeException(newRefValue, Constants.typeString(objectType));
+ }
}
sharedRefDBLog.info(
gson.toJson(
@@ -82,7 +84,7 @@
project,
currRef.getName(),
currRef.getObjectId().getName(),
- newRefValue.getName(),
+ newRefValue == null ? ObjectId.zeroId().name() : newRefValue.getName(),
committer,
commitMessage)));
} catch (IOException e) {
