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/impl/ConceptServiceImpl.java (modified) (1 diff)

openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/ConceptServiceImpl.java

@@ -275 +275 @@
-                int size = concepts.size(); 
-                if (size > 0){
-
+{
-                                log.warn("Multiple concepts found for '" + name + "'");
+                                for (Concept c:concepts){
+                                        if (c.getName(Context.getLocale()).getName().compareTo(name) == 0)
+                                                return c;
+                                }
+                        }
-                        return concepts.get(0);
-                }