opendev/gerrit
Code Issues Proposed changes

WebAppInitializer: Include invalid index.type in exception message

Browse Source 
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
This commit is contained in:
David Pursehouse
2015-09-24 10:55:09 +09:00
parent fe56041668
commit 27c7f6ceb8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -45,6 +45,7 @@ import com.google.gerrit.server.git.LocalDiskRepositoryManager;
import com.google.gerrit.server.git.ReceiveCommitsExecutorModule; import com.google.gerrit.server.git.ReceiveCommitsExecutorModule;
import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.index.IndexModule; 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.SignedTokenEmailTokenVerifier;
import com.google.gerrit.server.mail.SmtpEmailSender; import com.google.gerrit.server.mail.SmtpEmailSender;
import com.google.gerrit.server.mime.MimeUtil2Module; import com.google.gerrit.server.mime.MimeUtil2Module;
@@ -299,12 +300,13 @@ public class WebAppInitializer extends GuiceServletContextListener
modules.add(new RestCacheAdminModule()); modules.add(new RestCacheAdminModule());
modules.add(new GpgModule(config)); modules.add(new GpgModule(config));
AbstractModule changeIndexModule; AbstractModule changeIndexModule;
switch (IndexModule.getIndexType(cfgInjector)) { IndexType indexType = IndexModule.getIndexType(cfgInjector);
switch (indexType) {
case LUCENE: case LUCENE:
changeIndexModule = new LuceneIndexModule(); changeIndexModule = new LuceneIndexModule();
break; break;
default: default:
throw new IllegalStateException("unsupported index.type"); throw new IllegalStateException("unsupported index.type = " + indexType);
} }
modules.add(changeIndexModule); modules.add(changeIndexModule);
modules.add(new CanonicalWebUrlModule() { modules.add(new CanonicalWebUrlModule() {