diff --git a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
index 8b01fb854ba1aae6b44c67ea33af5870e1a5e081..30c21d19bf269592b3e522066f2b0652e615b060 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
@@ -22,6 +22,7 @@
package net.i2p.addressbook;
import java.io.BufferedReader;
+import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -41,7 +42,7 @@ import java.util.NoSuchElementException;
*
* @since 0.8.7
*/
-class ConfigIterator implements Iterator<Map.Entry<String, String>> {
+class ConfigIterator implements Iterator<Map.Entry<String, String>>, Closeable {
private BufferedReader input;
private ConfigEntry next;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 682d6f700cc9254ac78e5374e3ae579ef53d8487..1a4b1fb4c87383a3e5a79e8cef15913d4893da9d 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -20,6 +20,7 @@
package org.klomp.snark;
+import java.io.Closeable;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -50,7 +51,7 @@ import net.i2p.util.SystemVersion;
/**
* Maintains pieces on disk. Can be used to store and retrieve pieces.
*/
-public class Storage
+public class Storage implements Closeable
{
private final MetaInfo metainfo;
private final List<TorrentFile> _torrentFiles;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
index db2450b0113dca84f2117c4a4faf05e0378adc2a..e8e502da8b2c5b5cf51cbc5b01343f6b68fd52d2 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
@@ -9,6 +9,7 @@ package net.i2p.sam;
*/
import java.io.ByteArrayInputStream;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -31,7 +32,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-abstract class SAMMessageSession {
+abstract class SAMMessageSession implements Closeable {
protected final Log _log;
private I2PSession session;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
index 073ce3d15cbef11f62ad657b54cc6e002c206d23..34ab4393983a3c10082672cb1139e535ed31238f 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
@@ -1,5 +1,6 @@
package net.i2p.client.streaming.impl;
+import java.io.Closeable;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
@@ -25,7 +26,7 @@ import net.i2p.util.SimpleTimer2;
*<p>
* MessageOutputStream -> ConnectionDataReceiver -> Connection -> PacketQueue -> I2PSession
*/
-class PacketQueue implements SendMessageStatusListener {
+class PacketQueue implements SendMessageStatusListener, Closeable {
private final I2PAppContext _context;
private final Log _log;
private final ByteCache _cache = ByteCache.getInstance(64, 36*1024);
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
index 9a3c3e0be4006c3a9c868d476ff2fd7b5e988e6c..1c704f02e3e0708f6621f60c0ca46cf4fda0c060 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
@@ -1,8 +1,10 @@
package net.i2p.client.streaming.impl;
import java.io.BufferedOutputStream;
+import java.io.Closeable;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.Flushable;
import java.io.IOException;
import java.io.OutputStream;
@@ -41,7 +43,7 @@ import net.i2p.data.DataHelper;
*
* @since 0.9.4
*/
-public class PcapWriter {
+public class PcapWriter implements Closeable, Flushable {
/** big-endian, see file format ref - 24 bytes */
private static final byte[] FILE_HEADER = { (byte) 0xa1, (byte) 0xb2, (byte) 0xc3, (byte) 0xd4,
diff --git a/core/java/src/net/i2p/internal/I2CPMessageQueue.java b/core/java/src/net/i2p/internal/I2CPMessageQueue.java
index eda2d8f9572975f13e702199597478707212f636..76584255c2b6030276023ee2ee5c9e3f72a5a41e 100644
--- a/core/java/src/net/i2p/internal/I2CPMessageQueue.java
+++ b/core/java/src/net/i2p/internal/I2CPMessageQueue.java
@@ -1,5 +1,7 @@
package net.i2p.internal;
+import java.io.Closeable;
+
import net.i2p.data.i2cp.I2CPMessage;
/**
@@ -15,7 +17,7 @@ import net.i2p.data.i2cp.I2CPMessage;
* @author zzz
* @since 0.8.3
*/
-public abstract class I2CPMessageQueue {
+public abstract class I2CPMessageQueue implements Closeable {
/**
* Send a message, nonblocking.
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index 85d948c5375f3d2b5a169a217689cd7ebda0479c..f2df0a88175657f5f8773f903c558f7e95678c08 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -10,6 +10,7 @@ package net.i2p.util;
*/
import java.io.File;
+import java.io.Flushable;
import java.io.IOException;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -37,7 +38,7 @@ import net.i2p.data.DataHelper;
* writes them where appropriate.
*
*/
-public class LogManager {
+public class LogManager implements Flushable {
public final static String CONFIG_LOCATION_PROP = "loggerConfigLocation";
public final static String FILENAME_OVERRIDE_PROP = "loggerFilenameOverride";
public final static String CONFIG_LOCATION_DEFAULT = "logger.config";
diff --git a/core/java/src/net/metanotion/io/RandomAccessInterface.java b/core/java/src/net/metanotion/io/RandomAccessInterface.java
index fa382621c8332325e8162c1dca08727ee6dc03c4..1f3df6af654eda08f1912fea0fe824ab230ed16b 100644
--- a/core/java/src/net/metanotion/io/RandomAccessInterface.java
+++ b/core/java/src/net/metanotion/io/RandomAccessInterface.java
@@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.io;
+import java.io.Closeable;
import java.io.IOException;
-public interface RandomAccessInterface {
+public interface RandomAccessInterface extends Closeable {
public long getFilePointer() throws IOException;
public long length() throws IOException;
public int read() throws IOException;
diff --git a/core/java/src/net/metanotion/io/block/BlockFile.java b/core/java/src/net/metanotion/io/block/BlockFile.java
index f6ea7d63409ff7ef76129f4df03564ab00632d25..01870220489432d4d73ba242392ca9193661e9bd 100644
--- a/core/java/src/net/metanotion/io/block/BlockFile.java
+++ b/core/java/src/net/metanotion/io/block/BlockFile.java
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.io.block;
+import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
@@ -64,7 +65,7 @@ import net.i2p.util.Log;
* Pages are 1 KB and are numbered starting from 1.
* e.g. the Metaindex skiplist is at offset 1024 bytes
*/
-public class BlockFile {
+public class BlockFile implements Closeable {
public static final int PAGESIZE = 1024;
public static final long OFFSET_MOUNTED = 20;
public final Log log = I2PAppContext.getGlobalContext().logManager().getLog(BlockFile.class);
diff --git a/core/java/src/net/metanotion/io/block/index/BSkipList.java b/core/java/src/net/metanotion/io/block/index/BSkipList.java
index 5eef949cf4a518a21f1feaed13853ccd5bfcaf73..3a2d8b599c68bf82b93c995ed806081beee3f918 100644
--- a/core/java/src/net/metanotion/io/block/index/BSkipList.java
+++ b/core/java/src/net/metanotion/io/block/index/BSkipList.java
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.io.block.index;
+import java.io.Closeable;
import java.io.IOException;
import java.util.HashMap;
@@ -50,7 +51,7 @@ import net.i2p.util.Log;
*
* Always fits on one page.
*/
-public class BSkipList extends SkipList {
+public class BSkipList extends SkipList implements Closeable {
private static final long MAGIC = 0x536b69704c697374l; // "SkipList"
public int firstSpanPage = 0;
public int firstLevelPage = 0;
diff --git a/core/java/src/net/metanotion/util/skiplist/SkipLevels.java b/core/java/src/net/metanotion/util/skiplist/SkipLevels.java
index e4665fc4b316cc4f48852d8a85714c6c0fa205f4..bd9da7ba16b1f821b3da6caeb943a4948d29df12 100644
--- a/core/java/src/net/metanotion/util/skiplist/SkipLevels.java
+++ b/core/java/src/net/metanotion/util/skiplist/SkipLevels.java
@@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.util.skiplist;
+import java.io.Flushable;
+
import net.metanotion.io.block.BlockFile;
import net.i2p.I2PAppContext;
import net.i2p.util.Log;
-public class SkipLevels {
+public class SkipLevels implements Flushable {
/** We can't have more than 2**32 pages */
public static final int MAX_SIZE = 32;
diff --git a/core/java/src/net/metanotion/util/skiplist/SkipList.java b/core/java/src/net/metanotion/util/skiplist/SkipList.java
index 74e35f56ac7394725103038605d17cf6f9a5db76..6f44e9e23afc1f133b580aea751fe246e1ae4b6f 100644
--- a/core/java/src/net/metanotion/util/skiplist/SkipList.java
+++ b/core/java/src/net/metanotion/util/skiplist/SkipList.java
@@ -28,13 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.util.skiplist;
+import java.io.Flushable;
import java.util.Random;
import net.i2p.util.RandomSource;
//import net.metanotion.io.block.BlockFile;
-public class SkipList {
+public class SkipList implements Flushable {
/** the probability of each next higher level */
protected static final int P = 2;
private static final int MIN_SLOTS = 4;
diff --git a/core/java/src/net/metanotion/util/skiplist/SkipSpan.java b/core/java/src/net/metanotion/util/skiplist/SkipSpan.java
index ae2cc9ef7d86f7567d7ded293b525e597a3301fb..94210ebd4bc6d727b51322471761bb72cdacf588 100644
--- a/core/java/src/net/metanotion/util/skiplist/SkipSpan.java
+++ b/core/java/src/net/metanotion/util/skiplist/SkipSpan.java
@@ -28,9 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.metanotion.util.skiplist;
+import java.io.Flushable;
+
//import net.metanotion.io.block.BlockFile;
-public class SkipSpan {
+public class SkipSpan implements Flushable {
/** This is actually limited by BlockFile.spanSize which is much smaller */
public static final int MAX_SIZE = 256;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index ba10f887217df3e58609cd469357d3b3c6bee554..c3c413930ad068245f516647d11af620b4311828 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -13,6 +13,7 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
+import java.io.Flushable;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -193,7 +194,7 @@ class PersistentDataStore extends TransientDataStore {
* we will soon have to implement a scheme for keeping only
* a subset of all DatabaseEntrys in memory and keeping the rest on disk.
*/
- private class Writer implements Runnable {
+ private class Writer implements Runnable, Flushable {
private final Map<Hash, DatabaseEntry>_keys;
private final Object _waitLock;
private volatile boolean _quit;
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
index 3f77d73a7eaa7ce07d22fbb64eaa968ce4e6707f..703ee5050a3b6d9314dfe9af3944fb7247c29b52 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
@@ -1,5 +1,6 @@
package net.i2p.router.transport.ntcp;
+import java.io.Closeable;
import java.io.IOException;
import java.net.Inet6Address;
import java.nio.ByteBuffer;
@@ -64,7 +65,7 @@ import net.i2p.util.VersionComparator;
*</pre>
*
*/
-class NTCPConnection {
+class NTCPConnection implements Closeable {
private final RouterContext _context;
private final Log _log;
private SocketChannel _chan;