diff --git a/java/src/main/java/com/genexus/db/driver/GXDBDebug.java b/java/src/main/java/com/genexus/db/driver/GXDBDebug.java
index 09484f6ff..4c59b94d5 100644
--- a/java/src/main/java/com/genexus/db/driver/GXDBDebug.java
+++ b/java/src/main/java/com/genexus/db/driver/GXDBDebug.java
@@ -86,17 +86,12 @@ public GXDBDebug(JDBCLogConfig cfg)
 		}
 	}
 	private PrintWriter createWriter(String filename) throws IOException {
-		BufferedWriter buffWriter = null;
-		try (Writer baseWriter = new FileWriter(fileName)){
-			if (cfg.buffered){
-				buffWriter = new BufferedWriter(baseWriter);
-				return new PrintWriter(buffWriter);
-			} else {
-				return new PrintWriter(baseWriter);
-			}
-		} finally {
-			if (buffWriter != null) buffWriter.close();
+		Writer baseWriter = new FileWriter(fileName);
+		if	(cfg.buffered)
+		{
+			baseWriter = new BufferedWriter(baseWriter);
 		}
+		return new PrintWriter(baseWriter);
 	}
 
 	public void closeLog()
@@ -249,4 +244,9 @@ public void close(int level)
 		}
 	}
 
+	@Override
+	protected void finalize() {
+		closeLog();
+	}
+
 }