Revert "GCI - 9 #1"

k-joseph · k-joseph · commit b818792734a3 · 2015-02-13T17:33:01.000+03:00
diff --git a/api/src/main/java/org/openmrs/PersonName.java b/api/src/main/java/org/openmrs/PersonName.java
@@ -576,14 +576,6 @@ public int compareTo(PersonName other) {
 		return ret;
 	}
 	
-	public boolean equals(Object o) {
-		if (o instanceof PersonName) {
-			return compareTo((PersonName) o) == 0;
-		} else {
-			return false;
-		}
-	}
-	
 	/**
 	 * @since 1.5
 	 * @see org.openmrs.OpenmrsObject#getId()
diff --git a/api/src/main/java/org/openmrs/api/context/Context.java b/api/src/main/java/org/openmrs/api/context/Context.java
@@ -22,7 +22,6 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.WeakHashMap;
-import java.util.Arrays;
 
 import javax.mail.Authenticator;
 import javax.mail.PasswordAuthentication;
@@ -242,7 +241,7 @@ public static UserContext getUserContext() {
 		Object[] arr = userContextHolder.get();
 		
 		if (log.isTraceEnabled()) {
-			log.trace("Getting user context " + Arrays.toString(arr) + " from userContextHolder " + userContextHolder);
+			log.trace("Getting user context " + arr + " from userContextHolder " + userContextHolder);
 		}
 		
 		if (arr == null) {
diff --git a/api/src/main/java/org/openmrs/api/context/Daemon.java b/api/src/main/java/org/openmrs/api/context/Daemon.java
@@ -13,9 +13,6 @@
  */
 package org.openmrs.api.context;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.openmrs.User;
 import org.openmrs.api.APIAuthenticationException;
 import org.openmrs.api.APIException;
@@ -40,8 +37,6 @@ public class Daemon {
 	 */
 	protected static final String DAEMON_USER_UUID = "A4F30A1B-5EB9-11DF-A648-37A07F9C90FB";
 	
-	private static Log log = LogFactory.getLog(Daemon.class);
-	
 	protected static final ThreadLocal<Boolean> isDaemonThread = new ThreadLocal<Boolean>();
 	
 	/**
@@ -248,7 +243,8 @@ public void run() {
 			onStartupThread.join();
 		}
 		catch (InterruptedException e) {
-			log.error("\"onStartup\" thread interrupted!", e);
+			// ignore
+			e.printStackTrace();
 		}
 		
 		if (onStartupThread.exceptionThrown != null) {
diff --git a/api/src/main/java/org/openmrs/api/context/ServiceContext.java b/api/src/main/java/org/openmrs/api/context/ServiceContext.java
@@ -134,7 +134,7 @@ private ServiceContext() {
 	 * @return This VM's current ServiceContext.
 	 * @see org.openmrs.api.context.Context
 	 */
-	public static synchronized ServiceContext getInstance() {
+	public static ServiceContext getInstance() {
 		if (instance == null) {
 			instance = new ServiceContext();
 		}
@@ -146,7 +146,7 @@ public static synchronized ServiceContext getInstance() {
 	 * Null out the current instance of the ServiceContext. This should be used when modules are
 	 * refreshing (being added/removed) and/or openmrs is shutting down
 	 */
-	public static synchronized void destroyInstance() {
+	public static void destroyInstance() {
 		if (instance != null && instance.services != null) {
 			if (log.isDebugEnabled()) {
 				for (Map.Entry<Class, Object> entry : instance.services.entrySet()) {
diff --git a/api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java b/api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
@@ -804,8 +804,12 @@ private Obs parseObs(Encounter encounter, OBX obx, OBR obr, String uid) throws H
 			if (value != null) {
 				Date valueDate = getDate(value.getYear(), value.getMonth(), value.getDay(), value.getHour(), value
 				        .getMinute(), value.getSecond());
-				obs.setValueDatetime(valueDate);
-				
+				if (valueDate != null) {
+					obs.setValueDatetime(valueDate);
+				} else {
+					log.warn("Not creating null valued obs for concept " + concept);
+					return null;
+				}
 			} else {
 				log.warn("Not creating null valued obs for concept " + concept);
 				return null;
@@ -1291,7 +1295,7 @@ private void updateHealthCenter(Patient patient, PV1 pv1) {
 			
 			PersonAttribute currentHealthCenter = patient.getAttribute("Health Center");
 			
-			if (currentHealthCenter == null || !currentHealthCenter.getValue().equals(newLocationId.toString())) {
+			if (currentHealthCenter == null || !currentHealthCenter.equals(newLocationId.toString())) {
 				PersonAttribute newHealthCenter = new PersonAttribute(healthCenterAttrType, newLocationId.toString());
 				
 				log.debug("Updating patient's location from " + currentHealthCenter + " to " + newLocationId);
diff --git a/api/src/main/java/org/openmrs/module/ModuleFactory.java b/api/src/main/java/org/openmrs/module/ModuleFactory.java
@@ -447,7 +447,7 @@ public static Collection<Module> getLoadedModules() {
 	 *
 	 * @return map<ModuleId, Module>
 	 */
-	public static synchronized Map<String, Module> getLoadedModulesMap() {
+	public static Map<String, Module> getLoadedModulesMap() {
 		if (loadedModules == null) {
 			loadedModules = new WeakHashMap<String, Module>();
 		}
@@ -461,7 +461,7 @@ public static synchronized Map<String, Module> getLoadedModulesMap() {
 	 *
 	 * @return map<PackageName, Module>
 	 */
-	public static synchronized Map<String, Module> getLoadedModulesMapPackage() {
+	public static Map<String, Module> getLoadedModulesMapPackage() {
 		if (loadedModules == null) {
 			loadedModules = new WeakHashMap<String, Module>();
 			return loadedModules;
@@ -505,7 +505,7 @@ public static List<Module> getStartedModulesInOrder() {
 	 *
 	 * @return Map&lt;ModuleId, Module&gt;
 	 */
-	public static synchronized Map<String, Module> getStartedModulesMap() {
+	public static Map<String, Module> getStartedModulesMap() {
 		if (startedModules == null) {
 			startedModules = new WeakHashMap<String, Module>();
 		}
@@ -628,7 +628,7 @@ public static Module startModuleInternal(Module module) throws ModuleException {
 	 * @param applicationContext the spring application context instance to refresh
 	 * @param applicationContext the spring application context instance to refresh
 	 */
-	public static synchronized Module startModuleInternal(Module module, boolean isOpenmrsStartup,
+	public static Module startModuleInternal(Module module, boolean isOpenmrsStartup,
 	        AbstractRefreshableApplicationContext applicationContext) throws ModuleException {
 		
 		if (module != null) {
@@ -1406,7 +1406,7 @@ public static Collection<ModuleClassLoader> getModuleClassLoaders() {
 	 *
 	 * @return Map<Module, ModuleClassLoader>
 	 */
-	public static synchronized Map<Module, ModuleClassLoader> getModuleClassLoaderMap() {
+	public static Map<Module, ModuleClassLoader> getModuleClassLoaderMap() {
 		if (moduleClassLoaders == null) {
 			moduleClassLoaders = new WeakHashMap<Module, ModuleClassLoader>();
 		}
@@ -1419,7 +1419,7 @@ public static synchronized Map<Module, ModuleClassLoader> getModuleClassLoaderMa
 	 *
 	 * @return Map<String, List<Extension>>
 	 */
-	public static synchronized Map<String, List<Extension>> getExtensionMap() {
+	public static Map<String, List<Extension>> getExtensionMap() {
 		if (extensionMap == null) {
 			extensionMap = new WeakHashMap<String, List<Extension>>();
 		}
diff --git a/api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java b/api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java
@@ -261,7 +261,8 @@ public void setPatientId(Integer patientId) {
 				map.remove(this.patientId);
 			}
 		}
-		//reclaim some memory
+		
+		// reclaim some memory
 		garbageCollect();
 		
 		setPatient(null);
diff --git a/api/src/main/java/org/openmrs/reporting/export/DataExportUtil.java b/api/src/main/java/org/openmrs/reporting/export/DataExportUtil.java
@@ -229,7 +229,7 @@ public static void generateExport(DataExportReportObject dataExport, Cohort pati
 			log.debug("Clearing hibernate session");
 			Context.clearSession();
 			
-			//clear out excess objects
+			// clear out the excess objects
 			System.gc();
 			System.gc();
 		}
diff --git a/api/src/main/java/org/openmrs/reporting/export/RowPerObsDataExportReportObject.java b/api/src/main/java/org/openmrs/reporting/export/RowPerObsDataExportReportObject.java
@@ -211,7 +211,7 @@ public Cohort generatePatientSet(EvaluationContext context) {
 			patientIdSet.addAll(patientIds);
 		}
 		
-		if (location != null && !location.toString().equals("")) {
+		if (location != null && !location.equals("")) {
 			patientIdSet.retainAll(pss.getPatientsHavingLocation(getLocation()).getMemberIds());
 		}
 		
diff --git a/api/src/main/java/org/openmrs/util/DatabaseUpdater.java b/api/src/main/java/org/openmrs/util/DatabaseUpdater.java
@@ -670,7 +670,7 @@ public static void setAuthenticatedUserId(Integer userId) {
 	 *
 	 * @param warnings list of warnings to append to the end of the current list
 	 */
-	public static synchronized void reportUpdateWarnings(List<String> warnings) {
+	public static void reportUpdateWarnings(List<String> warnings) {
 		if (updateWarnings == null) {
 			updateWarnings = new LinkedList<String>();
 		}
diff --git a/api/src/main/java/org/openmrs/util/MemoryLeakUtil.java b/api/src/main/java/org/openmrs/util/MemoryLeakUtil.java
@@ -69,10 +69,12 @@ public static void shutdownMysqlCancellationTimer() {
 	public static void shutdownKeepAliveTimer() {
 		try {
 			final Field kac = HttpClient.class.getDeclaredField("kac");
+			if (kac == null) {
+				return;
+			}
 			
 			kac.setAccessible(true);
 			final Field keepAliveTimer = KeepAliveCache.class.getDeclaredField("keepAliveTimer");
-			
 			if (keepAliveTimer == null) {
 				return;
 			}
diff --git a/web/src/main/java/org/openmrs/web/Listener.java b/web/src/main/java/org/openmrs/web/Listener.java
@@ -77,8 +77,6 @@ public final class Listener extends ContextLoader implements ServletContextListe
 
 	private static boolean runtimePropertiesFound = false;
 	
-	Log log = LogFactory.getLog(Listener.class);
-	
 	private static Throwable errorAtStartup = null;
 	
 	/**
@@ -284,7 +282,6 @@ private void loadConstants(ServletContext servletContext) {
 	 * @return current contextPath of this webapp without initial slash
 	 */
 	private String getContextPath(ServletContext servletContext) {
-		Log log = LogFactory.getLog(Listener.class);
 		// Get the context path without the request.
 		String contextPath = "";
 		try {
@@ -300,11 +297,11 @@ private String getContextPath(ServletContext servletContext) {
 				contextPath = contextPath.substring(contextPath.lastIndexOf("/"));
 			}
 			catch (Exception e) {
-				log.error("Cannot find the contextPath of current webapp.", e);
+				e.printStackTrace();
 			}
 		}
 		catch (Exception e) {
-			log.error("ContextPath not defined", e);
+			e.printStackTrace();
 		}
 		
 		// trim off initial slash if it exists
@@ -532,7 +529,9 @@ public void contextDestroyed(ServletContextEvent event) {
 		catch (Exception e) {
 			// don't print the unhelpful "contextDAO is null" message
 			if (!"contextDAO is null".equals(e.getMessage())) {
-				log.error("Listener.contextDestroyed: Error while shutting down openmrs: ", e);
+				// not using log.error here so it can be garbage collected
+				System.out.println("Listener.contextDestroyed: Error while shutting down openmrs: ");
+				e.printStackTrace();
 			}
 		}
 		finally {
@@ -564,7 +563,8 @@ public void contextDestroyed(ServletContextEvent event) {
 			}
 		}
 		catch (Exception e) {
-			log.error("Listener.contextDestroyed: Failed to cleanup drivers in webapp", e);
+			System.err.println("Listener.contextDestroyed: Failed to cleanup drivers in webapp");
+			e.printStackTrace();
 		}
 		
 		MemoryLeakUtil.shutdownMysqlCancellationTimer();
diff --git a/web/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java b/web/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java
@@ -100,7 +100,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			}
 			
 			view = getSuccessView();
-			if (!success.toString().equals("")) {
+			if (!success.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
 			if (!error.equals("")) {
diff --git a/web/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java b/web/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java
@@ -101,7 +101,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			if (!success.toString().equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
-			if (!error.toString().equals("")) {
+			if (!error.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, error.toString());
 			}
 		}
diff --git a/web/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java b/web/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java
@@ -101,7 +101,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			}
 			
 			view = getSuccessView();
-			if (!success.toString().equals("")) {
+			if (!success.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
 			if (!error.equals("")) {
diff --git a/web/src/main/java/org/openmrs/web/controller/form/FormListController.java b/web/src/main/java/org/openmrs/web/controller/form/FormListController.java
@@ -88,10 +88,10 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 				success.append(noneDeleted);
 			}
 			view = getSuccessView();
-			if (!success.toString().equals("")) {
+			if (!success.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
-			if (!error.toString().equals("")) {
+			if (!error.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, error.toString());
 			}
 		}
diff --git a/web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java b/web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
-import java.util.Arrays;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -61,8 +60,8 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer
 			log.debug("Error name: " + e.getObjectName());
 			log.debug("Error code: " + e.getCode());
 			log.debug("Error message: " + e.getDefaultMessage());
-			log.debug("Error args: " + Arrays.toString(e.getArguments()));
-			log.debug("Error codes: " + Arrays.toString(e.getCodes()));
+			log.debug("Error args: " + e.getArguments());
+			log.debug("Error codes: " + e.getCodes());
 		}
 		
 		// call onSubmit manually so that we don't have to call
diff --git a/web/src/main/java/org/openmrs/web/controller/program/StateConversionListController.java b/web/src/main/java/org/openmrs/web/controller/program/StateConversionListController.java
@@ -92,10 +92,10 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 				success.append(noneDeleted);
 			}
 			view = getSuccessView();
-			if (!success.toString().equals("")) {
+			if (!success.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
-			if (!error.toString().equals("")) {
+			if (!error.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, error.toString());
 			}
 		}
diff --git a/web/src/main/java/org/openmrs/web/controller/user/PrivilegeListController.java b/web/src/main/java/org/openmrs/web/controller/user/PrivilegeListController.java
@@ -101,7 +101,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			}
 			
 			view = getSuccessView();
-			if (!success.toString().equals("")) {
+			if (!success.equals("")) {
 				httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success.toString());
 			}
 			if (!error.equals("")) {
diff --git a/web/src/main/java/org/openmrs/web/taglib/FieldGenTag.java b/web/src/main/java/org/openmrs/web/taglib/FieldGenTag.java
@@ -131,6 +131,7 @@ public int doStartTag() throws JspException {
 					if (val != null) {
 						startVal = val.toString();
 					}
+					startVal = (startVal == null) ? "" : startVal;
 					String fieldLength = this.parameterMap != null ? (String) this.parameterMap.get("fieldLength") : null;
 					fieldLength = (fieldLength == null) ? DEFAULT_INPUT_FLOAT_LENGTH : fieldLength;
 					output.setLength(0);
@@ -512,7 +513,7 @@ public FieldGenHandler getHandlerByClassName(String className) {
 		}
 		catch (Exception e) {
 			factory = null;
-			log.error("Couldn't get FieldGenHandlerFactory.", e);
+			e.printStackTrace();
 		}
 		
 		if (factory != null) {

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ public static Collection<Module> getLoadedModules() {`
`447`	`447`	`*`
`448`	`448`	`* @return map<ModuleId, Module>`
`449`	`449`	`*/`
`450`		`- public static synchronized Map<String, Module> getLoadedModulesMap() {`
	`450`	`+ public static Map<String, Module> getLoadedModulesMap() {`
`451`	`451`	`if (loadedModules == null) {`
`452`	`452`	`loadedModules = new WeakHashMap<String, Module>();`
`453`	`453`	`}`
`@@ -461,7 +461,7 @@ public static synchronized Map<String, Module> getLoadedModulesMap() {`
`461`	`461`	`*`
`462`	`462`	`* @return map<PackageName, Module>`
`463`	`463`	`*/`
`464`		`- public static synchronized Map<String, Module> getLoadedModulesMapPackage() {`
	`464`	`+ public static Map<String, Module> getLoadedModulesMapPackage() {`
`465`	`465`	`if (loadedModules == null) {`
`466`	`466`	`loadedModules = new WeakHashMap<String, Module>();`
`467`	`467`	`return loadedModules;`
`@@ -505,7 +505,7 @@ public static List<Module> getStartedModulesInOrder() {`
`505`	`505`	`*`
`506`	`506`	`* @return Map<ModuleId, Module>`
`507`	`507`	`*/`
`508`		`- public static synchronized Map<String, Module> getStartedModulesMap() {`
	`508`	`+ public static Map<String, Module> getStartedModulesMap() {`
`509`	`509`	`if (startedModules == null) {`
`510`	`510`	`startedModules = new WeakHashMap<String, Module>();`
`511`	`511`	`}`
`@@ -628,7 +628,7 @@ public static Module startModuleInternal(Module module) throws ModuleException {`
`628`	`628`	`* @param applicationContext the spring application context instance to refresh`
`629`	`629`	`* @param applicationContext the spring application context instance to refresh`
`630`	`630`	`*/`
`631`		`- public static synchronized Module startModuleInternal(Module module, boolean isOpenmrsStartup,`
	`631`	`+ public static Module startModuleInternal(Module module, boolean isOpenmrsStartup,`
`632`	`632`	`AbstractRefreshableApplicationContext applicationContext) throws ModuleException {`
`633`	`633`
`634`	`634`	`if (module != null) {`
`@@ -1406,7 +1406,7 @@ public static Collection<ModuleClassLoader> getModuleClassLoaders() {`
`1406`	`1406`	`*`
`1407`	`1407`	`* @return Map<Module, ModuleClassLoader>`
`1408`	`1408`	`*/`
`1409`		`- public static synchronized Map<Module, ModuleClassLoader> getModuleClassLoaderMap() {`
	`1409`	`+ public static Map<Module, ModuleClassLoader> getModuleClassLoaderMap() {`
`1410`	`1410`	`if (moduleClassLoaders == null) {`
`1411`	`1411`	`moduleClassLoaders = new WeakHashMap<Module, ModuleClassLoader>();`
`1412`	`1412`	`}`
`@@ -1419,7 +1419,7 @@ public static synchronized Map<Module, ModuleClassLoader> getModuleClassLoaderMa`
`1419`	`1419`	`*`
`1420`	`1420`	`* @return Map<String, List<Extension>>`
`1421`	`1421`	`*/`
`1422`		`- public static synchronized Map<String, List<Extension>> getExtensionMap() {`
	`1422`	`+ public static Map<String, List<Extension>> getExtensionMap() {`
`1423`	`1423`	`if (extensionMap == null) {`
`1424`	`1424`	`extensionMap = new WeakHashMap<String, List<Extension>>();`
`1425`	`1425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,8 @@ public void setPatientId(Integer patientId) {`
`261`	`261`	`map.remove(this.patientId);`
`262`	`262`	`}`
`263`	`263`	`}`
`264`		`- //reclaim some memory`
	`264`	`+`
	`265`	`+ // reclaim some memory`
`265`	`266`	`garbageCollect();`
`266`	`267`
`267`	`268`	`setPatient(null);`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public static void generateExport(DataExportReportObject dataExport, Cohort pati`
`229`	`229`	`log.debug("Clearing hibernate session");`
`230`	`230`	`Context.clearSession();`
`231`	`231`
`232`		`- //clear out excess objects`
	`232`	`+ // clear out the excess objects`
`233`	`233`	`System.gc();`
`234`	`234`	`System.gc();`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public Cohort generatePatientSet(EvaluationContext context) {`
`211`	`211`	`patientIdSet.addAll(patientIds);`
`212`	`212`	`}`
`213`	`213`
`214`		`- if (location != null && !location.toString().equals("")) {`
	`214`	`+ if (location != null && !location.equals("")) {`
`215`	`215`	`patientIdSet.retainAll(pss.getPatientsHavingLocation(getLocation()).getMemberIds());`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ public static void setAuthenticatedUserId(Integer userId) {`
`670`	`670`	`*`
`671`	`671`	`* @param warnings list of warnings to append to the end of the current list`
`672`	`672`	`*/`
`673`		`- public static synchronized void reportUpdateWarnings(List<String> warnings) {`
	`673`	`+ public static void reportUpdateWarnings(List<String> warnings) {`
`674`	`674`	`if (updateWarnings == null) {`
`675`	`675`	`updateWarnings = new LinkedList<String>();`
`676`	`676`	`}`