From 672fca961483ebf4eb3f63903de963e0df99aeff Mon Sep 17 00:00:00 2001
From: Mouhsin Elmajdouby <mouhsin.e.elmajdouby@oracle.com>
Date: Wed, 27 Aug 2025 11:14:26 +0100
Subject: [PATCH] Treat blank connectionStringIndex as missing to enable
 default/single-entry fallback

---
 .../main/java/oracle/jdbc/provider/util/WalletUtils.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
index 74dc8f54..515d2def 100644
--- a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
+++ b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
@@ -114,7 +114,8 @@ private WalletUtils() {}
    * </p>
    * <ol>
    *   <li>
-   *     <strong>If {@code connectionStringIndex} is {@code null}:</strong>
+   *     <strong>If {@code connectionStringIndex} is {@code null}, empty,
+   *     or blank:</strong>
    *     <ul>
    *       <li>
    *         The method first attempts to retrieve credentials using the default
@@ -183,6 +184,11 @@ private WalletUtils() {}
   public static Credentials getCredentials(
     byte[] walletBytes, char[] walletPassword, String connectionStringIndex) {
 
+    // treat blank as missing
+    if (connectionStringIndex != null && connectionStringIndex.trim().isEmpty()) {
+      connectionStringIndex = null;
+    }
+
     OracleWallet wallet = new OracleWallet();
     try {
       wallet.setWalletArray(walletBytes, walletPassword);