Address comments

Azure · Jul 11, 2019 · badb691 · badb691
1 parent 1d1975e
commit badb691
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/sdk/eventhub/event-hubs/src/eventHubSender.ts b/sdk/eventhub/event-hubs/src/eventHubSender.ts
@@ -454,6 +454,13 @@ export class EventHubSender extends LinkEntity {
       options = {};
     }
 
+    const operationTimeoutInMs =
+      options.retryOptions == undefined ||
+        options.retryOptions.operationTimeoutInMs == undefined ||
+        options.retryOptions.operationTimeoutInMs < Constants.defaultOperationTimeoutInSeconds * 1000
+        ? Constants.defaultOperationTimeoutInSeconds * 1000
+        : options.retryOptions.operationTimeoutInMs;
+
     const abortSignal: AbortSignalLike | undefined = options.abortSignal;
     const sendEventPromise = () =>
       new Promise<void>((resolve, reject) => {
@@ -577,15 +584,7 @@ export class EventHubSender extends LinkEntity {
           this._sender!.on(SenderEvents.rejected, onRejected);
           this._sender!.on(SenderEvents.modified, onModified);
           this._sender!.on(SenderEvents.released, onReleased);
-          waitTimer = setTimeout(
-            actionAfterTimeout,
-            options == undefined ||
-              options.retryOptions == undefined ||
-              options.retryOptions.operationTimeoutInMs == undefined ||
-              options.retryOptions.operationTimeoutInMs < 0
-              ? Constants.defaultOperationTimeoutInSeconds * 1000
-              : options.retryOptions.operationTimeoutInMs
-          );
+          waitTimer = setTimeout(actionAfterTimeout, operationTimeoutInMs);
           const delivery = this._sender!.send(message, tag, 0x80013700);
           log.sender(
             "[%s] Sender '%s', sent message with delivery id: %d and tag: %s",

diff --git a/sdk/eventhub/event-hubs/src/managementClient.ts b/sdk/eventhub/event-hubs/src/managementClient.ts
@@ -292,16 +292,18 @@ export class ManagementClient extends LinkEntity {
         options = {};
       }
 
+      const operationTimeoutInMs =
+        options.retryOptions == undefined ||
+          options.retryOptions.operationTimeoutInMs == undefined ||
+          options.retryOptions.operationTimeoutInMs < Constants.defaultOperationTimeoutInSeconds * 1000
+          ? Constants.defaultOperationTimeoutInSeconds * 1000
+          : options.retryOptions.operationTimeoutInMs;
+
       const sendRequestOptions: SendRequestOptions = {
         maxRetries: options.retryOptions && options.retryOptions.maxRetries,
         abortSignal: options.abortSignal,
         requestName: options.requestName,
-        timeoutInSeconds:
-          options.retryOptions == undefined ||
-          options.retryOptions.operationTimeoutInMs == undefined ||
-          options.retryOptions.operationTimeoutInMs < 0
-            ? Constants.defaultOperationTimeoutInSeconds
-            : options.retryOptions.operationTimeoutInMs / 1000,
+        timeoutInSeconds: operationTimeoutInMs / 1000,
         delayInSeconds:
           options.retryOptions && options.retryOptions.retryInterval && options.retryOptions.retryInterval >= 0
             ? options.retryOptions.retryInterval / 1000