Non empty database should not fail when finishing database setup -

TRUNK-4968

web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java

@@ -39,8 +39,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import liquibase.changelog.ChangeSet;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,6 +49,7 @@
 import org.openmrs.api.APIAuthenticationException;
 import org.openmrs.api.PasswordException;
 import org.openmrs.api.context.Context;
+import org.openmrs.api.context.ContextAuthenticationException;
 import org.openmrs.module.MandatoryModuleException;
 import org.openmrs.module.OpenmrsCoreModuleException;
 import org.openmrs.module.web.WebModuleUtil;
@@ -75,6 +74,8 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.ContextLoader;
 
+import liquibase.changelog.ChangeSet;
+
 /**
  * This is the first filter that is processed. It is only active when starting OpenMRS for the very
  * first time. It will redirect all requests to the {@link WebConstants#SETUP_PAGE_URL} if the
@@ -1765,9 +1766,14 @@ && getRuntimePropertiesFile().setReadable(true)) {
 						try {
 							// change the admin user password from "test" to what they input above
 							if (wizardModel.createTables) {
-								Context.authenticate("admin", "test");
-								Context.getUserService().changePassword("test", wizardModel.adminUserPassword);
-								Context.logout();
+								try {
+									Context.authenticate("admin", "test");
+									Context.getUserService().changePassword("test", wizardModel.adminUserPassword);
+									Context.logout();
+								}
+								catch (ContextAuthenticationException ex) {
+									log.info("No need to change admin password.");
+								}
 							}
 						}
 						catch (Exception e) {