Revert "Minor ajustments for gerrit-gitblit plugin"

This reverts commit f15f17a8035717d260eb77b766c7b9c748729170.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 4e34db4a..2c5bfe51 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3006,7 +3006,7 @@ public class GitBlit implements ServletContextListener {
 	 * 

 	 * @return Map<String, SettingModel>

 	 */

-	private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) {

+	private ServerSettings loadSettingModels() {

 		ServerSettings settingsModel = new ServerSettings();

 		settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();

 		settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();

@@ -3016,7 +3016,7 @@ public class GitBlit implements ServletContextListener {
 			// Read bundled Gitblit properties to extract setting descriptions.

 			// This copy is pristine and only used for populating the setting

 			// models map.

-		        InputStream is = referencePropertiesInputStream;

+			InputStream is = getClass().getResourceAsStream("/reference.properties");

 			BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));

 			StringBuilder description = new StringBuilder();

 			SettingModel setting = new SettingModel();

@@ -3266,11 +3266,7 @@ public class GitBlit implements ServletContextListener {
 	 * @see ServletContextListener.contextInitialize(ServletContextEvent)

 	 */

 	@Override

-        public void contextInitialized(ServletContextEvent contextEvent) {

-	    contextInitialized(contextEvent, getClass().getResourceAsStream("/reference.properties"));

-	}

-

-	public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) {

+	public void contextInitialized(ServletContextEvent contextEvent) {

 		servletContext = contextEvent.getServletContext();

 		if (settings == null) {

 			// Gitblit is running in a servlet container

@@ -3335,7 +3331,7 @@ public class GitBlit implements ServletContextListener {
 			}

 		}

 		

-		settingsModel = loadSettingModels(referencePropertiesInputStream);

+		settingsModel = loadSettingModels();

 		serverStatus.servletContainer = servletContext.getServerInfo();

 	}