OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java (modified) (2 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java

@@ -58 +58 @@
-         * @see org.openmrs.api.db.EncounterDAO#saveEncounter(org.openmrs.Encounter)
-         */
-void
+Encounter
-                sessionFactory.getCurrentSession().saveOrUpdate(encounter);
+                return encounter;
-        }
-
@@ -134 +135 @@
-         * @see org.openmrs.api.db.EncounterDAO#saveEncounterType(org.openmrs.EncounterType)
-         */
-void
+EncounterType
-                sessionFactory.getCurrentSession().saveOrUpdate(encounterType);
+                return encounterType;
-        }
-