Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2a2419ed72a
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a7b420eef76
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 11, 2013

  1. https://tickets.openmrs.org/browse/TRUNK-3959?page=com.atlassian.jira… 

    ….plugin.system.issuetabpanels:all-tabpanel
    @gordonbr @wluyima
    gordonbr authored and wluyima committed Jun 11, 2013
    Copy the full SHA
    ff55d3d View commit details

  2. TRUNK-3955 - Unrelated types in equals call

    @gordonbr @wluyima
    gordonbr authored and wluyima committed Jun 11, 2013
    Copy the full SHA
    97cd57d View commit details

  3. Comparison of strings using != instead of .equals - TRUNK-3959 

    Made some minor changes as per review comments
    @gordonbr @wluyima
    gordonbr authored and wluyima committed Jun 11, 2013

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2a7b420 View commit details
5 changes: 4 additions & 1 deletion api/src/main/java/org/openmrs/api/context/ServiceContext.java
View file
Original file line number Diff line number Diff line change
@@ -817,7 +817,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*/}
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/reporting/export/DataExportReportObject.java
View file
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ public Cohort generatePatientSet(EvaluationContext context) {
cohort = new Cohort(getPatientIds());
}

if (location != null && !location.equals("")) {
if (location != null) {
cohort = intersectFast(cohort, pss.getPatientsHavingLocation(getLocation()));
}

2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/validator/PersonNameValidator.java
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ public void validatePersonName(PersonName personName, Errors errors, boolean arr
// Make sure the entered name value is sensible
String namePattern = Context.getAdministrationService().getGlobalProperty(
OpenmrsConstants.GLOBAL_PROPERTY_PATIENT_NAME_REGEX);
if (namePattern != null && namePattern != "") {
if (StringUtils.isNotBlank(namePattern)) {
if (StringUtils.isNotBlank(personName.getGivenName()) && !personName.getGivenName().matches(namePattern))
errors.rejectValue(getFieldKey("givenName", arrayInd, testInd), "GivenName.invalid");
if (StringUtils.isNotBlank(personName.getMiddleName()) && !personName.getMiddleName().matches(namePattern))