Fix NPE when using password in Properties

Signed-off-by: John Eberhard <[email protected]>
IBM · Jan 29, 2024 · a24eb42 · a24eb42
1 parent 94a4eb2
commit a24eb42
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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)