Don't cherry-pick:

[addressbook-mailer-ejb.git] / src / java / org / mxchange / addressbook / mailer / model / delivery / AddressbookMailerSingletonBean.java

diff --git a/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java b/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java
index 1eb0fd3fb75483b06a2e527f8affacde965449ed..8d93145da66a5a03e04dde74c2312df7f5487f67 100644 (file)
--- a/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java
+++ b/src/java/org/mxchange/addressbook/mailer/model/delivery/AddressbookMailerSingletonBean.java
@@ -146,15 +146,18 @@ public class AddressbookMailerSingletonBean extends BaseMailerBean implements De
                // Are some variables set?
                if ((emailWrapper.getTemplateVariables() != null) && (!emailWrapper.getTemplateVariables().isEmpty())) {
                        // Add all variables
-                       for (Map.Entry<Object, Object> entry : emailWrapper.getTemplateVariables().entrySet()) {
+                       for (final Map.Entry<Object, Object> entry : emailWrapper.getTemplateVariables().entrySet()) {
                                // Get key/value
-                               String key = (String) entry.getKey();
-                               String value = (String) entry.getValue();
+                               final String key = (String) entry.getKey();
+                               final String value = (String) entry.getValue();
 
                                // Both should not be empty
                                if (null == key) {
                                        // Throw NPE
                                        throw new NullPointerException("key is null"); //NOI18N
+                               } else if (key.isEmpty()) {
+                                       // Throw IAE
+                                       throw new NullPointerException("key is empty"); //NOI18N
                                } else if (null == value) {
                                        // Throw NPE again
                                        throw new NullPointerException(MessageFormat.format("value for key={0} is null", key)); //NOI18N