From 0fb80b51338fcdaba6276c5a2ffb6955e0b7c920 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 13 Jun 2011 09:24:59 -0700 Subject: [PATCH] Correctly handle missing refs/meta/config branch If the refs/meta/config branch does not exist, getRevision() used to throw NPE when trying to access the ProjectDetail. This is because on a missing branch the revision field is null, and must return a null to the caller rather than copying the value. Change-Id: If4dd771d39382b89443a234f16d13a7a4e6838c8 --- .../java/com/google/gerrit/server/git/VersionedMetaData.java | 2 +- 1 file changed, 1 insertion(+), 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 bb910443f9..55dd2e183c 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 @@ -66,7 +66,7 @@ public abstract class VersionedMetaData { /** @return revision of the metadata that was loaded. */ public ObjectId getRevision() { - return revision.copy(); + return revision != null ? revision.copy() : null; } /** Initialize in-memory as though the repository branch doesn't exist. */