Check whether topChannel is destroyed too

esatterwhite · Nov 13, 2015 · 9954fa5 · 9954fa5
1 parent 7a2bea9
commit 9954fa5
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/client.js b/client.js
@@ -26,7 +26,8 @@ var TypedError = require('error/typed');
 var ChannelDestroyedError = TypedError({
     type: 'ringpop.client.channel-destroyed',
     message: 'Channel is already destroyed',
-    endpoint: null
+    endpoint: null,
+    channelType: null
 });
 
 function RingpopClient(subChannel) {
@@ -96,7 +97,18 @@ RingpopClient.prototype._request = function _request(opts, endpoint, head, body,
     if (this.subChannel.destroyed) {
         process.nextTick(function onTick() {
             callback(ChannelDestroyedError({
-                endpoint: endpoint
+                endpoint: endpoint,
+                channelType: 'subChannel'
+            }));
+        });
+        return;
+    }
+
+    if (this.subChannel.topChannel.destroyed) {
+        process.nextTick(function onTick() {
+            callback(ChannelDestroyedError({
+                endpoint: endpoint,
+                channelType: 'topChannel'
             }));
         });
         return;