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: 1ba55049ea85
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: 9793fcec2efd
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 29, 2014

  1. TRUNK-4243: Redundant nullcheck of value known to be non-null

    @dszafranek
    dszafranek committed Jan 29, 2014
    Copy the full SHA
    39463eb View commit details

  2. Merge pull request #592 from dszafranek/TRUNK-4243 

    TRUNK-4243: Redundant nullcheck of value known to be non-null
    @dkayiwa
    dkayiwa committed Jan 29, 2014
    Copy the full SHA
    9793fce View commit details
Showing with 2 additions and 13 deletions.
  1. +2 −12 api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
  2. +0 −1 web/src/main/java/org/openmrs/web/taglib/FieldGenTag.java
14 changes: 2 additions & 12 deletions api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
View file
Original file line number Diff line number Diff line change
@@ -755,12 +755,7 @@ else if (concept.getDatatype().isCoded()) {
DT value = (DT) obx5;
if (value != null) {
Date valueDate = getDate(value.getYear(), value.getMonth(), value.getDay(), 0, 0, 0);
if (valueDate != null) {
obs.setValueDatetime(valueDate);
} else {
log.warn("Not creating null valued obs for concept " + concept);
return null;
}
obs.setValueDatetime(valueDate);
} else {
log.warn("Not creating null valued obs for concept " + concept);
return null;
@@ -784,12 +779,7 @@ else if (concept.getDatatype().isCoded()) {
TM value = (TM) obx5;
if (value != null) {
Date valueTime = getDate(0, 0, 0, value.getHour(), value.getMinute(), value.getSecond());
if (valueTime != null) {
obs.setValueDatetime(valueTime);
} else {
log.warn("Not creating null valued obs for concept " + concept);
return null;
}
obs.setValueDatetime(valueTime);
} else {
log.warn("Not creating null valued obs for concept " + concept);
return null;
1 change: 0 additions & 1 deletion web/src/main/java/org/openmrs/web/taglib/FieldGenTag.java
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,6 @@ 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_INT_LENGTH : fieldLength;
output.setLength(0);