From cae94320b5940fcd37fd1d7dd978fb9ad5e3223e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 22 Mar 2012 19:55:40 +0000
Subject: [PATCH] remove FlushTimer

---
 .../src/net/i2p/router/tunnel/FlushTimer.java   | 17 -----------------
 .../i2p/router/tunnel/PumpedTunnelGateway.java  |  2 +-
 .../net/i2p/router/tunnel/TunnelGateway.java    |  4 ++--
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 router/java/src/net/i2p/router/tunnel/FlushTimer.java

diff --git a/router/java/src/net/i2p/router/tunnel/FlushTimer.java b/router/java/src/net/i2p/router/tunnel/FlushTimer.java
deleted file mode 100644
index b55384b804..0000000000
--- a/router/java/src/net/i2p/router/tunnel/FlushTimer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package net.i2p.router.tunnel;
-
-import net.i2p.util.SimpleTimer;
-
-/**
- *
- */
-class FlushTimer extends SimpleTimer {
-    /*
-      Streaming lib has been moved from SimpleTimer to SimpleTimer2, eliminating the congestion.
-      So there's not much left using SimpleTimer, and FlushTimer doesn't need its own 4 threads any more
-      (if it ever did?...)
-    */
-    //private static final FlushTimer _instance = new FlushTimer();
-    //public static final SimpleTimer getInstance() { return _instance; }
-    //protected FlushTimer() { super("TunnelFlushTimer"); }
-}
diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
index d1b81d66ef..4752c611e2 100644
--- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
@@ -121,7 +121,7 @@ class PumpedTunnelGateway extends TunnelGateway {
         }
         
         if (delayedFlush) {
-            FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount);
+            _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
         }
         _context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining);
         long complete = System.currentTimeMillis();
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelGateway.java b/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
index 037e1aad16..de21ea079d 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
@@ -124,7 +124,7 @@ class TunnelGateway {
         }
         
         if (delayedFlush) {
-            FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount);
+            _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
         }
         _context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining);
         if (_log.shouldLog(Log.DEBUG)) {
@@ -304,7 +304,7 @@ class TunnelGateway {
             }
             
             if (wantRequeue)
-                FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount);
+                _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
             else
                 _lastFlush = _context.clock().now();