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=0d3c7405cc1cb8f5fcaaa54790adc6d7e5f823e6;p=pizzaservice-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/pizzaaplication/database/BasePizzaDatabaseBean.java b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java index b92a402..359223c 100644 --- a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java +++ b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java @@ -501,7 +501,12 @@ public abstract class BasePizzaDatabaseBean 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