Fixed inconsistent backport of #811

Added general debug logging for statement completion failure

Author: mrotteveel

src/main/org/firebirdsql/jdbc/FBPreparedStatement.java

@@ -32,7 +32,6 @@
 import org.firebirdsql.jdbc.field.FBFlushableField;
 import org.firebirdsql.jdbc.field.FBFlushableField.CachedObject;
 import org.firebirdsql.jdbc.field.FieldDataProvider;
-import org.firebirdsql.logging.LoggerFactory;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -147,14 +146,7 @@ protected FBPreparedStatement(GDSHelper c, String sql, int rsType,
             try {
                 prepareFixedStatement(sql);
             } catch (Exception e) {
-                try {
-                    notifyStatementCompleted(false);
-                } catch (SQLException e2) {
-                    LoggerFactory.getLogger(getClass())
-                            .debug("Failed statement completion triggered by exception during statement prepare", e);
-                    e2.setNextException(e instanceof SQLException ? (SQLException) e : new SQLException(e));
-                    throw e2;
-                }
+                notifyStatementCompleted(false, e);
                 throw e;
             }
         }

src/main/org/firebirdsql/jdbc/FBStatement.java

@@ -306,12 +306,14 @@ void notifyStatementCompleted(boolean success, Exception originalException) {
         try {
             notifyStatementCompleted(success);
         } catch (SQLException e) {
+            log.debug("Statement completion failure by exception", e);
             if (originalException instanceof SQLException) {
                 ((SQLException) originalException).setNextException(e);
             } else {
                 originalException.addSuppressed(e);
             }
         } catch (RuntimeException e) {
+            log.debug("Statement completion failure by exception", e);
             originalException.addSuppressed(e);
         }
     }