From: Roland Häder Date: Fri, 23 Jun 2017 22:17:30 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cba57e7857931988fdf8f5c789e2b52498da0dfd;p=addressbook-core.git Please cherry-pick: - put() does not accept NULL values (throws NPE) Signed-off-by: Roland Häder --- diff --git a/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java index 57b8abc..1664575 100644 --- a/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java +++ b/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java @@ -501,7 +501,12 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { // Set base URL and random password variables.put("baseUrl", baseUrl); //NOI18N - variables.put("randomPassword", randomPassword); //NOI18N + variables.put("randomPassword", ""); //NOI18N + + // Is the random password set? + if ((randomPassword instanceof String) && (!randomPassword.isEmpty())) { + variables.put("randomPassword", randomPassword); //NOI18N + } // Set all // @TODO Language from message bundle