Stop abusing finalizers and implement AutoCloseable instead

ibauersachs · ibauersachs · commit 968e56972e66 · 2019-06-01T22:20:54.000+02:00
diff --git a/src/main/java/org/xbill/DNS/Master.java b/src/main/java/org/xbill/DNS/Master.java
@@ -13,7 +13,7 @@
  * @author Brian Wellington
  */
 
-public class Master {
+public class Master implements AutoCloseable {
 
 private Name origin;
 private File file;
@@ -420,8 +420,8 @@ else if ((token.value).charAt(0) == '$') {
 }
 
 @Override
-protected void
-finalize() {
+public void
+close() {
 	if (st != null)
 		st.close();
 }
diff --git a/src/main/java/org/xbill/DNS/Tokenizer.java b/src/main/java/org/xbill/DNS/Tokenizer.java
@@ -29,7 +29,7 @@
  * @author Bob Halley
  */
 
-public class Tokenizer {
+public class Tokenizer implements AutoCloseable{
 
 private static String delim = " \t\n;()\"";
 private static String quotes = "\"";
@@ -714,6 +714,7 @@ else if (sb.length() == 0)
 /**
  * Closes any files opened by this tokenizer.
  */
+@Override
 public void
 close() {
 	if (wantClose) {
@@ -725,10 +726,4 @@ else if (sb.length() == 0)
 	}
 }
 
-@Override
-protected void
-finalize() {
-	close();
-}
-
 }
