NonUniqueObjectException: a different object with the same identifier value was already associated with the session: [org.openmrs.Patient#] - TRUNK-3728

dkayiwa · wluyima · commit 4c3cb13e3a61 · 2013-05-12T14:30:07.000-04:00
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
@@ -166,6 +166,13 @@ private void insertPatientStubIfNeeded(Patient patient) {
 					}
 				}
 			}
+			
+			//Without evicting person, you will get this error when promoting person to patient
+			//org.hibernate.NonUniqueObjectException: a different object with the same identifier
+			//value was already associated with the session: [org.openmrs.Patient#]
+			//see TRUNK-3728
+			Person person = (Person) sessionFactory.getCurrentSession().get(Person.class, patient.getPersonId());
+			sessionFactory.getCurrentSession().evict(person);
 		}
 		
 		// commenting this out to get the save patient as a user option to work correctly
diff --git a/api/src/test/java/org/openmrs/api/PatientServiceTest.java b/api/src/test/java/org/openmrs/api/PatientServiceTest.java
@@ -2260,4 +2260,22 @@ public void getPatientIdentifierTypes_shouldOrderAsDefaultComparator() throws Ex
 		Collections.sort(sortedList, new PatientIdentifierTypeDefaultComparator());
 		Assert.assertEquals(sortedList, list);
 	}
+
+    /**
+     * https://tickets.openmrs.org/browse/TRUNK-3728
+     *
+     * @see {@link PatientService#savePatient(Patient)}
+     */
+    @Test
+    @Verifies(value = "should not throw NonUniqueObjectException when called with person promoted to patient", method = "savePatient(Patient)")
+    public void savePatient_shouldNotThrowNonUniqueObjectExceptionWhenCalledWithPersonPromotedToPatient() throws Exception {
+        Person person = personService.getPerson(1);
+        Patient patient = patientService.getPatientOrPromotePerson(person.getPersonId());
+        PatientIdentifier patientIdentifier = new PatientIdentifier("some identifier", new PatientIdentifierType(2),
+                new Location(1));
+        patientIdentifier.setPreferred(true);
+        patient.addIdentifier(patientIdentifier);
+
+        patientService.savePatient(patient);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,13 @@ private void insertPatientStubIfNeeded(Patient patient) {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
	`169`	`+`
	`170`	`+ //Without evicting person, you will get this error when promoting person to patient`
	`171`	`+ //org.hibernate.NonUniqueObjectException: a different object with the same identifier`
	`172`	`+ //value was already associated with the session: [org.openmrs.Patient#]`
	`173`	`+ //see TRUNK-3728`
	`174`	`+ Person person = (Person) sessionFactory.getCurrentSession().get(Person.class, patient.getPersonId());`
	`175`	`+ sessionFactory.getCurrentSession().evict(person);`
`169`	`176`	`}`
`170`	`177`
`171`	`178`	`// commenting this out to get the save patient as a user option to work correctly`