Make sure to provide a timeout and callback to Url's ByteArrayInputSt…

…ream and MslControl.receive()'s MessageInputStream.
Netflix · Sep 9, 2016 · 716f77e · 716f77e
1 parent 3bdefe4
commit 716f77e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/src/main/javascript/io/Url.js b/core/src/main/javascript/io/Url.js
@@ -214,8 +214,9 @@ var IHttpLocation = util.Class.create({
         close: function close(timeout, callback) {
             InterruptibleExecutor(callback, function() {
                 if (this._buffer)
-                    this._buffer.close();
-                return true;
+                    this._buffer.close(timeout, callback);
+                else
+                	return true;
             }, this);
         },
 

diff --git a/core/src/main/javascript/msg/MslControl.js b/core/src/main/javascript/msg/MslControl.js
@@ -2944,7 +2944,11 @@ var MslControl$MslChannel;
             function handshakeResponse(request) {
                 InterruptibleExecutor(callback, function() {
                     // Close the request. We're done with it.
-                    request.close();
+                    request.close(this._timeout, {
+                    	result: function() {},
+                    	timeout: function() {},
+                    	error: function() {}
+                    });
 
                     // This is a handshake request so automatically return a response.
                     //