OpenMRS

Timestamp:

07/16/08 12:29:31 (6 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

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

openmrs/branches/1.3.x/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;
-        }
-