From 803ee3bb250a37d513461cd553aec834d3d54352 Mon Sep 17 00:00:00 2001 From: Naoyuki Kanezawa Date: Fri, 18 Oct 2013 02:01:44 +0900 Subject: [PATCH] compatible with engine.io 0.7.9 --- .../engineio/client/transports/WebSocket.java | 31 ++----------------- src/test/resources/package.json | 2 +- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java index 534a58f..f014790 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java @@ -15,19 +15,12 @@ import java.net.URISyntaxException; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; public class WebSocket extends Transport { public static final String NAME = "websocket"; private WebSocketClient socket; - private Future bufferedAmountId; - - private ScheduledExecutorService drainScheduler = Executors.newSingleThreadScheduledExecutor(); public WebSocket(Options opts) { @@ -101,31 +94,13 @@ public class WebSocket extends Transport { } }; - if (this.socket.getConnection().hasBufferedData()) { - this.bufferedAmountId = this.drainScheduler.scheduleAtFixedRate(new Runnable() { - @Override - public void run() { - EventThread.exec(new Runnable() { - @Override - public void run() { - if (!self.socket.getConnection().hasBufferedData()) { - self.bufferedAmountId.cancel(true); - ondrain.run(); - } - } - }); - } - }, 50, 50, TimeUnit.MILLISECONDS); - } else { - EventThread.nextTick(ondrain); - } + // fake drain + // defer to next tick to allow Socket to clear writeBuffer + EventThread.nextTick(ondrain); } @Override protected void onClose() { - if (this.bufferedAmountId != null) { - this.bufferedAmountId.cancel(true); - } super.onClose(); } diff --git a/src/test/resources/package.json b/src/test/resources/package.json index b55e102..ab2345a 100644 --- a/src/test/resources/package.json +++ b/src/test/resources/package.json @@ -3,6 +3,6 @@ "version": "0.0.0", "private": true, "dependencies": { - "engine.io": "0.7.3" + "engine.io": "0.7.9" } }