Ignore blank message code - UIFR-140

openmrs · Feb 5, 2014 · 8260d34 · 8260d34
1 parent d20da4d
commit 8260d34
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java b/api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java
@@ -19,6 +19,7 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.context.Context;
@@ -121,6 +122,10 @@ public String getMessage(MessageSourceResolvable resolvable, Locale locale) {
 	 *      java.lang.Object[], java.util.Locale)
 	 */
 	public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
+		if (StringUtils.isBlank(code)) {
+			return "";
+		}
+
 		return activeMessageSource.getMessage(code, args, code, locale);
 	}
 
@@ -129,6 +134,10 @@ public String getMessage(String code, Object[] args, Locale locale) throws NoSuc
 	 *      java.lang.Object[], java.lang.String, java.util.Locale)
 	 */
 	public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
+		if (StringUtils.isBlank(code)) {
+			return "";
+		}
+
 		return activeMessageSource.getMessage(code, args, defaultMessage, locale);
 	}