This is an automated email from the ASF dual-hosted git repository.
thurka pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5af5f30e97 validate() - do not remove connection if 'schemas' is empty
5af5f30e97 is described below
commit 5af5f30e97c08222539b0c9ce79afc19e1a52b68
Author: Tomas Hurka <[email protected]>
AuthorDate: Thu Jun 15 14:11:43 2023 +0200
validate() - do not remove connection if 'schemas' is empty
---
.../org/netbeans/modules/java/lsp/server/db/DBAddConnection.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBAddConnection.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBAddConnection.java
index c24ddae16a..4a2d69e2af 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBAddConnection.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBAddConnection.java
@@ -238,16 +238,21 @@ public class DBAddConnection extends CodeActionsProvider {
Either<List<QuickPickItem>,String> userData =
data.get(USER_ID);
int i = ((Double)
driverData.getLeft().get(0).getUserData()).intValue();
JDBCDriver driver = drivers[i];
+ boolean failed = true;
+
schemas.clear();
DatabaseConnection dbconn =
DatabaseConnection.create(driver, urlData.getRight(), userData.getRight(),
null, passwordData.getRight(), true);
try {
ConnectionManager.getDefault().addConnection(dbconn);
schemas.addAll(getSchemas(dbconn));
+ failed = false;
} catch(DatabaseException | SQLException ex) {
return
CompletableFuture.completedFuture(ex.getMessage());
} finally {
try {
-
ConnectionManager.getDefault().removeConnection(dbconn);
+ if (failed || !schemas.isEmpty()) {
+
ConnectionManager.getDefault().removeConnection(dbconn);
+ }
} catch (DatabaseException ex) {}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
