Merge "Don't serve gwtjsonrpc endpoints if GWT UI isn't enabled"
diff --git a/java/com/google/gerrit/httpd/WebModule.java b/java/com/google/gerrit/httpd/WebModule.java
index 538d605..d115f43 100644
--- a/java/com/google/gerrit/httpd/WebModule.java
+++ b/java/com/google/gerrit/httpd/WebModule.java
@@ -56,7 +56,9 @@
installAuthModule();
if (options.enableMasterFeatures()) {
install(new UrlModule(options, authConfig));
- install(new UiRpcModule());
+ if (options.enableGwtUi()) {
+ install(new UiRpcModule());
+ }
}
install(new GerritRequestModule());
install(new GitOverHttpServlet.Module(options.enableMasterFeatures()));