From 22859802039a296e21e50436d6616adae9c44014 Mon Sep 17 00:00:00 2001 From: John Eberhard Date: Fri, 26 Jan 2024 14:14:15 -0600 Subject: [PATCH] Fix NPE when using password in Properties Signed-off-by: John Eberhard --- src/main/java/com/ibm/as400/access/AS400JDBCDataSource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/as400/access/AS400JDBCDataSource.java b/src/main/java/com/ibm/as400/access/AS400JDBCDataSource.java index 70eac49db..8067c1c8f 100644 --- a/src/main/java/com/ibm/as400/access/AS400JDBCDataSource.java +++ b/src/main/java/com/ibm/as400/access/AS400JDBCDataSource.java @@ -3832,9 +3832,11 @@ else if (JDProperties.isToolboxTraceSet(newProperties, null) == JDProperties.TRA else if (propIndex == JDProperties.USER) setUser(propertyValue); else if (propIndex == JDProperties.PASSWORD) { - char[] clearPassword = properties_.getClearPassword(); + char[] clearPassword = propertyValue.toCharArray(); setPassword(clearPassword); CredentialVault.clearArray(clearPassword); + if (JDTrace.isTraceOn()) + JDTrace.logInformation (this, "Use of password property not recommended: using setPassword(char[]) instead"); } else if (propIndex == JDProperties.SECURE) setSecure(propertyValue.equals(TRUE_) ? true : false); else if (propIndex == JDProperties.KEEP_ALIVE)