commit e21a864864feec0ab23f80a490018751efa8f4eb
author Shawn O. Pearce <sop@google.com> Mon Jun 01 12:46:55 2009 -0700
committer Shawn O. Pearce <sop@google.com> Mon Jun 01 12:47:32 2009 -0700
tree 9d80fa3009dfb37de001412c1727c5205393ae40
parent 1805bcab794d6b2dc635a83510c45b720a2ec925

Create GerritConfig after parsing gerrit.config file

Otherwise we may not have all of the property values we need.

Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/server/GerritServer.java

diff --git a/src/main/java/com/google/gerrit/server/GerritServer.java b/src/main/java/com/google/gerrit/server/GerritServer.java
index 693b6a6..4e13f01 100644
--- a/src/main/java/com/google/gerrit/server/GerritServer.java
+++ b/src/main/java/com/google/gerrit/server/GerritServer.java
@@ -241,6 +241,13 @@
     gerritPersonIdentTemplate = new PersonIdent(sConfig.gerritGitName, email);
     outgoingMail = createOutgoingMail();
 
+    final ReviewDb c = db.open();
+    try {
+      loadGerritConfig(c);
+    } finally {
+      c.close();
+    }
+
     Common.setSchemaFactory(db);
     Common.setProjectCache(new ProjectCache());
     Common.setAccountCache(new AccountCache());
@@ -662,8 +669,6 @@
         throw new OrmException("Unsupported schema version " + sVer.versionNbr
             + "; expected schema version " + ReviewDb.VERSION);
       }
-
-      loadGerritConfig(c);
     } finally {
       c.close();
     }