All java class wrapping a native object must call dispose at destruction.

Author: mgautierfr

lib/src/main/java/org/kiwix/libkiwix/Server.java

@@ -45,6 +45,10 @@ public Server(Library library)
     setNativeServer(library);
   }
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
   private native void setNativeServer(Library library);
   private native void dispose();
   private long nativeHandle;

lib/src/main/java/org/kiwix/libzim/Archive.java

@@ -104,6 +104,9 @@ public Archive(FileDescriptor fd, long offset, long size)
   private native void setNativeArchiveByFD(FileDescriptor fd);
   private native void setNativeArchiveEmbedded(FileDescriptor fd, long offset, long size);
 
+  @Override
+  protected void finalize() { dispose(); }
+
 
 ///--------- The wrapper thing
   // To delete our native wrapper

lib/src/main/java/org/kiwix/libzim/Blob.java

@@ -26,9 +26,10 @@ public class Blob
   public native String getData();
   public native long size();
 
-  protected void finalize() {
-    dispose();
-  }
+
+  @Override
+  protected void finalize() { dispose(); }
+
 
 ///--------- The wrapper thing
   // To delete our native wrapper

lib/src/main/java/org/kiwix/libzim/Entry.java

@@ -31,9 +31,8 @@ public class Entry
   public native Item getRedirect();
   public native Entry getRedirectEntry();
 
-  protected void finalize() {
-    dispose();
-  }
+  @Override
+  protected void finalize() { dispose(); }
 
 ///--------- The wrapper thing
   // To delete our native wrapper

lib/src/main/java/org/kiwix/libzim/EntryIterator.java

@@ -29,6 +29,10 @@ private EntryIterator(int order) {
   public native boolean hasNext();
   public native Entry next();
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();

lib/src/main/java/org/kiwix/libzim/Item.java

@@ -30,9 +30,8 @@ public class Item
   public native Blob getData();
   public native long getSize();
 
-  protected void finalize() {
-    dispose();
-  }
+  @Override
+  protected void finalize() { dispose(); }
 
 ///--------- The wrapper thing
   // To delete our native wrapper

lib/src/main/java/org/kiwix/libzim/Query.java

@@ -28,6 +28,10 @@ public Query(String query) {
   public native Query setQuery(String query);
   public native Query setGeorange(float latitude, float longitute, float distance);
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();

lib/src/main/java/org/kiwix/libzim/Search.java

@@ -26,6 +26,10 @@ public class Search
   public native SearchIterator getResults(int start, int maxResults);
   public native long getEstimatedMatches();
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();

lib/src/main/java/org/kiwix/libzim/SearchIterator.java

@@ -36,6 +36,10 @@ public class SearchIterator implements Iterator<Entry>
   public native boolean hasNext();
   public native Entry next();
 
+
+  @Override
+  protected void finalize() { dispose(); }
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();

lib/src/main/java/org/kiwix/libzim/Searcher.java

@@ -51,6 +51,10 @@ public Searcher(Archive[] archives) throws Exception
   private native void setNativeSearcher(Archive archive);
   private native void setNativeSearcherMulti(Archive[] archives);
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();