[netbeans] branch master updated: Attempting to avoid a crash when running a project/file when there's no DB connection.

[thurka]

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 43bd91a438 Attempting to avoid a crash when running a project/file 
when there's no DB connection.
     new d824c6e84d Merge pull request #6085 from lahodaj/fix-run-actions
43bd91a438 is described below

commit 43bd91a4386e6ddb3aac5c0cc6f9d0f22f167bb7
Author: Jan Lahoda <jlah...@openjdk.org>
AuthorDate: Fri Jun 16 19:51:10 2023 +0200

    Attempting to avoid a crash when running a project/file when there's no DB 
connection.
---
 .../java/lsp/server/db/DBConnectionProvider.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
index 254404f0be..4f8d6e338e 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionProvider.java
@@ -60,14 +60,16 @@ public class DBConnectionProvider extends 
CodeActionsProvider{
         }
         Map<String, String> result = new HashMap<> ();
         DatabaseConnection conn = 
ConnectionManager.getDefault().getPreferredConnection(true);
-            
-        result.put("DATASOURCES_DEFAULT_URL", conn.getDatabaseURL()); //NOI18N
-        result.put("DATASOURCES_DEFAULT_USERNAME", conn.getUser()); //NOI18N
-        result.put("DATASOURCES_DEFAULT_PASSWORD", conn.getPassword()); 
//NOI18N
-        result.put("DATASOURCES_DEFAULT_DRIVER_CLASS_NAME", 
conn.getDriverClass()); //NOI18N
-        String ocid = (String) conn.getConnectionProperties().get("OCID"); 
//NOI18N
-        if (ocid != null && !ocid.isEmpty()) {
-            result.put("DATASOURCES_DEFAULT_OCID", ocid); //NOI18N
+
+        if (conn != null) {
+            result.put("DATASOURCES_DEFAULT_URL", conn.getDatabaseURL()); 
//NOI18N
+            result.put("DATASOURCES_DEFAULT_USERNAME", conn.getUser()); 
//NOI18N
+            result.put("DATASOURCES_DEFAULT_PASSWORD", conn.getPassword()); 
//NOI18N
+            result.put("DATASOURCES_DEFAULT_DRIVER_CLASS_NAME", 
conn.getDriverClass()); //NOI18N
+            String ocid = (String) conn.getConnectionProperties().get("OCID"); 
//NOI18N
+            if (ocid != null && !ocid.isEmpty()) {
+                result.put("DATASOURCES_DEFAULT_OCID", ocid); //NOI18N
+            }
         }
             
         return CompletableFuture.completedFuture(result);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists