#953 Refine and reduce finalization

Author: mrotteveel

src/jna-client/org/firebirdsql/gds/ng/jna/JnaDatabase.java

@@ -500,10 +500,11 @@ public void processStatusVector(ISC_STATUS[] statusVector, WarningMessageCallbac
 
     @Override
     protected void finalize() throws Throwable {
-        try {
-            if (isAttached()) {
-                safelyDetach();
-            }
+        try (LockCloseable ignored = withLock()) {
+            if (handle.getValue() == 0 || !isAttached()) return;
+            clientLibrary.fb_cancel_operation(
+                    new ISC_STATUS[JnaDatabase.STATUS_VECTOR_SIZE], handle, (short) fb_cancel_abort);
+            // Intentionally not processing status vector
         } finally {
             super.finalize();
         }

src/jna-client/org/firebirdsql/gds/ng/jna/JnaStatement.java

@@ -482,4 +482,18 @@ public final RowDescriptor emptyRowDescriptor() {
     private void processStatusVector() throws SQLException {
         getDatabase().processStatusVector(statusVector, getStatementWarningCallback());
     }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (getState() == StatementState.CLOSED) return;
+        try (LockCloseable ignored = withLock()) {
+            if (handle.getValue() == 0 || !database.isAttached()) return;
+            clientLibrary.isc_dsql_free_statement(
+                    new ISC_STATUS[JnaDatabase.STATUS_VECTOR_SIZE], handle, (short) ISCConstants.DSQL_drop);
+            // We're intentionally not processing the status vector
+        } finally {
+            super.finalize();
+        }
+    }
+
 }

src/main/org/firebirdsql/gds/ng/AbstractFbStatement.java

@@ -690,15 +690,6 @@ protected final void checkStatementValid(StatementState ignoreState) throws SQLE
         checkStatementValid();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (getState() != StatementState.CLOSED) close();
-        } finally {
-            super.finalize();
-        }
-    }
-
     @Override
     public FbTransaction getTransaction() {
         return transaction;

src/main/org/firebirdsql/gds/ng/wire/AbstractFbWireDatabase.java

@@ -361,17 +361,4 @@ public byte[] getInfo(int operation, int handle, byte[] requestItems, int maxBuf
      */
     public abstract FbWireAsynchronousChannel initAsynchronousChannel() throws SQLException;
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (!connection.isConnected()) return;
-            if (isAttached()) {
-                safelyDetach();
-            } else {
-                closeConnection();
-            }
-        } finally {
-            super.finalize();
-        }
-    }
 }

src/main/org/firebirdsql/gds/ng/wire/AbstractFbWireService.java

@@ -190,18 +190,4 @@ protected final void closeConnection() throws IOException {
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (!connection.isConnected()) return;
-            if (isAttached()) {
-                safelyDetach();
-            } else {
-                closeConnection();
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
 }

src/main/org/firebirdsql/gds/ng/wire/AbstractFbWireStatement.java

@@ -18,6 +18,7 @@
  */
 package org.firebirdsql.gds.ng.wire;
 
+import org.firebirdsql.gds.ISCConstants;
 import org.firebirdsql.gds.impl.wire.WireProtocolConstants;
 import org.firebirdsql.gds.impl.wire.XdrInputStream;
 import org.firebirdsql.gds.impl.wire.XdrOutputStream;
@@ -242,4 +243,17 @@ private void deferredExceptionHandler(Exception exception) {
             forceState(StatementState.ERROR);
         }
     }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (getState() == StatementState.CLOSED) return;
+        try (LockCloseable ignored = withLock()) {
+            StatementState state = getState();
+            if (state == StatementState.NEW || state == StatementState.CLOSED || !database.isAttached()) return;
+            free(ISCConstants.DSQL_drop);
+        } finally {
+            super.finalize();
+        }
+    }
+
 }

src/main/org/firebirdsql/gds/ng/wire/version10/V10AsynchronousChannel.java

@@ -305,15 +305,6 @@ private boolean processSingleEvent() {
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            close();
-        } finally {
-            super.finalize();
-        }
-    }
-
     private class ChannelDatabaseListener implements DatabaseListener {
 
         @Override