Merge 151c48e into 6e98a8c

openmrs · Oct 15, 2016 · 0397ac5 · 0397ac5
2 parents 6e98a8c + 151c48e
commit 0397ac5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java b/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
@@ -56,6 +56,7 @@
 import org.openmrs.web.filter.util.CustomResourceLoader;
 import org.openmrs.web.filter.util.ErrorMessageConstants;
 import org.openmrs.web.filter.util.FilterUtil;
+import org.openmrs.api.context.Context;
 import org.springframework.web.context.ContextLoader;
 
 /**
@@ -740,7 +741,7 @@ public void executing(ChangeSet changeSet, int numChangeSetsToRun) {
 							if (CollectionUtils.isNotEmpty(warnings)) {
 								reportWarnings(warnings);
 								warnings = null;
-							}
+							}							
 						}
 						catch (InputRequiredException inputRequired) {
 							// the user would be stepped through the questions returned here.
@@ -764,6 +765,9 @@ public void executing(ChangeSet changeSet, int numChangeSetsToRun) {
 						setMessage("Starting OpenMRS");
 						try {
 							startOpenmrs(filterConfig.getServletContext());
+
+							setMessage("Rebilding search indexes");
+							Context.updateSearchIndex();
 						}
 						catch (Exception e) {
 							log.error("Unable to complete the startup.", e);