Fix compiling on Java 8

ibauersachs · ibauersachs · commit 6c519f2053f3 · 2024-09-12T13:45:55.000+02:00
diff --git a/src/main/java/org/xbill/DNS/Cache.java b/src/main/java/org/xbill/DNS/Cache.java
@@ -213,11 +213,13 @@ public Cache(InputStream input) throws IOException {
 
   private <T> Cache(Master m) throws IOException {
     this();
-    try (m) {
+    try {
       Record r;
       while ((r = m.nextRecord()) != null) {
         addRecord(r, Credibility.HINT);
       }
+    } finally {
+      m.close();
     }
   }
 
diff --git a/src/main/java/org/xbill/DNS/Zone.java b/src/main/java/org/xbill/DNS/Zone.java
@@ -177,11 +177,13 @@ public Zone(Name zone, int dclass, String remote) throws IOException, ZoneTransf
 
   private void fromMasterFile(Name origin, Master m) throws IOException {
     this.origin = origin;
-    try (m) {
+    try {
       Record r;
       while ((r = m.nextRecord()) != null) {
         maybeAddRecord(r);
       }
+    } finally {
+      m.close();
     }
     validate();
   }

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,13 @@ public Cache(InputStream input) throws IOException {`
`213`	`213`
`214`	`214`	`private <T> Cache(Master m) throws IOException {`
`215`	`215`	`this();`
`216`		`- try (m) {`
	`216`	`+ try {`
`217`	`217`	`Record r;`
`218`	`218`	`while ((r = m.nextRecord()) != null) {`
`219`	`219`	`addRecord(r, Credibility.HINT);`
`220`	`220`	`}`
	`221`	`+ } finally {`
	`222`	`+ m.close();`
`221`	`223`	`}`
`222`	`224`	`}`
`223`	`225`
Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,13 @@ public Zone(Name zone, int dclass, String remote) throws IOException, ZoneTransf`
`177`	`177`
`178`	`178`	`private void fromMasterFile(Name origin, Master m) throws IOException {`
`179`	`179`	`this.origin = origin;`
`180`		`- try (m) {`
	`180`	`+ try {`
`181`	`181`	`Record r;`
`182`	`182`	`while ((r = m.nextRecord()) != null) {`
`183`	`183`	`maybeAddRecord(r);`
`184`	`184`	`}`
	`185`	`+ } finally {`
	`186`	`+ m.close();`
`185`	`187`	`}`
`186`	`188`	`validate();`
`187`	`189`	`}`