Prevent NPE during cleanup and improve logging

FirebirdSQL · Nov 23, 2023 · feb65bd · feb65bd
1 parent 0238e9e
commit feb65bd
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/test/org/firebirdsql/common/extension/UsesDatabaseExtension.java b/src/test/org/firebirdsql/common/extension/UsesDatabaseExtension.java
@@ -84,18 +84,19 @@ void sharedAfter() {
                 try {
                     fbManager.dropDatabase(databasePath, FBTestProperties.DB_USER, FBTestProperties.DB_PASSWORD);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    System.getLogger(getClass().getName()).log(System.Logger.Level.ERROR, "Exception dropping DB", e);
                 }
             }
-        } catch (Exception ex){
-            ex.printStackTrace();
+        } catch (Exception e){
+            System.getLogger(getClass().getName()).log(System.Logger.Level.ERROR, "Exception dropping DBs", e);
         } finally {
             try {
                 if (!(fbManager == null || fbManager.getState().equals("Stopped"))) {
                     fbManager.stop();
                 }
-            } catch (Exception ex) {
-                ex.printStackTrace();
+            } catch (Exception e) {
+                System.getLogger(getClass().getName())
+                        .log(System.Logger.Level.ERROR, "Exception stopping FBManager", e);
             }
             fbManager = null;
         }