From 27c7f6ceb8f50e57be3bb9c517000e79b9208965 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Thu, 24 Sep 2015 10:55:09 +0900
Subject: [PATCH] WebAppInitializer: Include invalid index.type in exception
 message

When index.type is configured with an invalid value, IllegalStateException
is raised but does not mention what the invalid value is.

Add the index.type to the message.

Change-Id: I35171b2dd4c5dc8c7afeaed2fe38509f6ad5b440
---
 .../java/com/google/gerrit/httpd/WebAppInitializer.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
index 905d776cfc..ad96e2af70 100644
--- a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
+++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
@@ -45,6 +45,7 @@ import com.google.gerrit.server.git.LocalDiskRepositoryManager;
 import com.google.gerrit.server.git.ReceiveCommitsExecutorModule;
 import com.google.gerrit.server.git.WorkQueue;
 import com.google.gerrit.server.index.IndexModule;
+import com.google.gerrit.server.index.IndexModule.IndexType;
 import com.google.gerrit.server.mail.SignedTokenEmailTokenVerifier;
 import com.google.gerrit.server.mail.SmtpEmailSender;
 import com.google.gerrit.server.mime.MimeUtil2Module;
@@ -299,12 +300,13 @@ public class WebAppInitializer extends GuiceServletContextListener
     modules.add(new RestCacheAdminModule());
     modules.add(new GpgModule(config));
     AbstractModule changeIndexModule;
-    switch (IndexModule.getIndexType(cfgInjector)) {
+    IndexType indexType = IndexModule.getIndexType(cfgInjector);
+    switch (indexType) {
       case LUCENE:
         changeIndexModule = new LuceneIndexModule();
         break;
       default:
-        throw new IllegalStateException("unsupported index.type");
+        throw new IllegalStateException("unsupported index.type = " + indexType);
     }
     modules.add(changeIndexModule);
     modules.add(new CanonicalWebUrlModule() {