Fixed class comparison in ServiceContext and upated DataExportReportO…

…bject to properly check for a null location in generatePatientSet(EvaluationContext context) method - TRUNK-3959
openmrs · Jun 11, 2013 · e76fc6b · e76fc6b
1 parent 20d9055
commit e76fc6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/api/context/ServiceContext.java b/api/src/main/java/org/openmrs/api/context/ServiceContext.java
@@ -816,7 +816,10 @@ public void setModuleService(List<Object> params) {
 					if (log.isDebugEnabled()) {
 						log.debug("cls2 classloader: " + cls.getClass().getClassLoader() + " uid: "
 						        + cls.getClass().getClassLoader().hashCode());
-						log.debug("cls==cls2: " + String.valueOf(cls == cls));
+						//pay attention that here, cls = Class.forName(classString), the system class loader and
+						//cls2 is the openmrs class loader, like above.
+						log.debug("cls==cls2: " + String.valueOf(cls == 
+								OpenmrsClassLoader.getInstance().loadClass(classString)));
 					}
 				}
 				catch (Exception e) { /*pass*/}

diff --git a/api/src/main/java/org/openmrs/reporting/export/DataExportReportObject.java b/api/src/main/java/org/openmrs/reporting/export/DataExportReportObject.java
@@ -191,8 +191,8 @@ public Cohort generatePatientSet(EvaluationContext context) {
 		if (getPatientIds() != null && getPatientIds().size() > 0) {
 			cohort = new Cohort(getPatientIds());
 		}
-		
-		if (location != null && !location.equals("")) {
+
+        if (location != null) {
 			cohort = intersectFast(cohort, pss.getPatientsHavingLocation(getLocation()));
 		}