From d0a9f71a922ed3b6ee8154acbd4bc32a9909c261 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Wed, 10 Sep 2014 13:42:11 +0200
Subject: [PATCH] Minor refactoring in Reindex program

We don't need a Config instance in the class scope any more, since
it's only used in the checkNotSlaveMode method.

Change-Id: I6a9128201ca858ce5986bc6045b363653f2ab843
---
 gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
index a767929a0e..cf4fdbf75a 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
@@ -84,7 +84,6 @@ public class Reindex extends SiteProgram {
   private boolean dryRun;
 
   private Injector dbInjector;
-  private Config cfg;
   private Injector sysInjector;
   private ChangeIndex index;
 
@@ -93,8 +92,6 @@ public class Reindex extends SiteProgram {
     mustHaveValidSite();
     dbInjector = createDbInjector(MULTI_USER);
     threads = ThreadLimiter.limitThreads(dbInjector, threads);
-    cfg = dbInjector.getInstance(
-        Key.get(Config.class, GerritServerConfig.class));
     checkNotSlaveMode();
     disableLuceneAutomaticCommit();
     if (version == null) {
@@ -125,6 +122,8 @@ public class Reindex extends SiteProgram {
   }
 
   private void checkNotSlaveMode() throws Die {
+    Config cfg = dbInjector.getInstance(
+        Key.get(Config.class, GerritServerConfig.class));
     if (cfg.getBoolean("container", "slave", false)) {
       throw die("Cannot run reindex in slave mode");
     }