diff --git a/api/src/main/java/org/openmrs/CohortMembership.java b/api/src/main/java/org/openmrs/CohortMembership.java index 61cc8b82e212..a4022874312b 100644 --- a/api/src/main/java/org/openmrs/CohortMembership.java +++ b/api/src/main/java/org/openmrs/CohortMembership.java @@ -94,15 +94,15 @@ public void setPatientId(Integer patientId) { } public Date getStartDate() { - return startDate; + return startDate != null ? (Date) startDate.clone() : null; } public void setStartDate(Date startDate) { - this.startDate = startDate; + this.startDate = startDate != null ? new Date(startDate.getTime()) : null; } public Date getEndDate() { - return endDate; + return endDate != null ? (Date) endDate.clone() : null; } /** @@ -112,9 +112,10 @@ public Date getEndDate() { * @param endDate */ public void setEndDate(Date endDate) { - this.endDate = endDate; + this.endDate = endDate != null ? new Date(endDate.getTime()) : null; } + /** * Sorts by following fields, in order: *