summaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-06-09 19:57:23 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-06-09 19:57:23 +0200
commit1ea0795b2894b04e4db0d5d78c044eb63a9cfaa2 (patch)
treeac506e801b2b3dd1406504ffce24c8c3027032be /js/src
parentFix for run TestUtil.py with valgrind (diff)
downloadice-1ea0795b2894b04e4db0d5d78c044eb63a9cfaa2.tar.bz2
ice-1ea0795b2894b04e4db0d5d78c044eb63a9cfaa2.tar.xz
ice-1ea0795b2894b04e4db0d5d78c044eb63a9cfaa2.zip
Fixed setting of timeout in WSTransceiver
Diffstat (limited to 'js/src')
-rw-r--r--js/src/Ice/browser/WSTransceiver.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/js/src/Ice/browser/WSTransceiver.js b/js/src/Ice/browser/WSTransceiver.js
index 9cea74acd92..3e57b41e8dd 100644
--- a/js/src/Ice/browser/WSTransceiver.js
+++ b/js/src/Ice/browser/WSTransceiver.js
@@ -186,7 +186,7 @@ var WSTransceiver = Ice.Class({
var transceiver = this;
if(this._fd.bufferedAmount > 1024)
{
- setTimeout(function() { transceiver._bytesWrittenCallback(0, 0); }, 50);
+ Timer.setTimeout(function() { transceiver._bytesWrittenCallback(0, 0); }, 50);
return false;
}
@@ -199,10 +199,6 @@ var WSTransceiver = Ice.Class({
packetSize = this._maxSendPacketSize;
}
- function timeoutCb(transceiver) {
- transceiver._bytesWrittenCallback(0, 0);
- }
-
while(packetSize > 0)
{
var slice = byteBuffer.b.slice(byteBuffer.position, byteBuffer.position + packetSize);
@@ -220,7 +216,7 @@ var WSTransceiver = Ice.Class({
if(this._fd.bufferedAmount > 0 && packetSize > 0)
{
- Timer.setTimeout(timeoutCb(transceiver), 50);
+ Timer.setTimeout(function() { transceiver._bytesWrittenCallback(0, 0); }, 50);
return false;
}
}