From 918f3d3c40c8113f28bc1aa1bba0b4f0f5630899 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 20 Feb 2019 16:35:52 -0800 Subject: [PATCH] Fix merge doubling --- .../src/MessagePackHubProtocol.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts b/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts index 30f231c8cf..add7f42db0 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts @@ -4,8 +4,10 @@ import { Buffer } from "buffer"; import * as msgpack5 from "msgpack5"; -import { CancelInvocationMessage, CompletionMessage, HubMessage, IHubProtocol, ILogger, InvocationMessage, - LogLevel, MessageHeaders, MessageType, NullLogger, StreamInvocationMessage, StreamItemMessage, TransferFormat } from "@aspnet/signalr"; +import { + CancelInvocationMessage, CompletionMessage, HubMessage, IHubProtocol, ILogger, InvocationMessage, + LogLevel, MessageHeaders, MessageType, NullLogger, StreamInvocationMessage, StreamItemMessage, TransferFormat +} from "@aspnet/signalr"; import { BinaryMessageFormat } from "./BinaryMessageFormat"; import { isArrayBuffer } from "./Utils"; @@ -267,13 +269,6 @@ export class MessagePackHubProtocol implements IHubProtocol { return BinaryMessageFormat.write(payload.slice()); } - private writeCancelInvocation(cancelInvocationMessage: CancelInvocationMessage): ArrayBuffer { - const msgpack = msgpack5(); - const payload = msgpack.encode([MessageType.CancelInvocation, cancelInvocationMessage.headers || {}, cancelInvocationMessage.invocationId]); - - return BinaryMessageFormat.write(payload.slice()); - } - private readHeaders(properties: any): MessageHeaders { const headers: MessageHeaders = properties[1] as MessageHeaders; if (typeof headers !== "object") {