Extra channel closures have no effect

[#119367885]

Author: camelpunch

RMQClient/RMQSuspendResumeDispatcher.m

@@ -40,7 +40,7 @@ - (void)activateWithChannel:(id<RMQChannel>)channel
 
 - (void)blockingWaitOn:(Class)method {
     [self.commandQueue blockingEnqueue:^{
-        [self handleClosure:^{
+        [self handleClosure:nil operation:^{
             [self.commandQueue suspend];
         }];
     }];
@@ -56,8 +56,8 @@ - (void)blockingWaitOn:(Class)method {
 - (void)sendSyncMethod:(id<RMQMethod>)method
      completionHandler:(void (^)(RMQFramesetValidationResult *result))completionHandler {
     [self.commandQueue enqueue:^{
-        [self handleClosure:^{
-            if ([method isKindOfClass:[RMQChannelClose class]]) {
+        [self handleClosure:method operation:^{
+            if ([self isClose:method]) {
                 self.state = DispatcherStateClosedByClient;
             }
 
@@ -85,7 +85,7 @@ - (void)sendSyncMethod:(id<RMQMethod>)method {
 
 - (void)sendSyncMethodBlocking:(id<RMQMethod>)method {
     [self.commandQueue blockingEnqueue:^{
-        [self handleClosure:^{
+        [self handleClosure:method operation:^{
             RMQFrameset *frameset = [[RMQFrameset alloc] initWithChannelNumber:self.channelNumber method:method];
             [self.commandQueue suspend];
             [self.sender sendFrameset:frameset];
@@ -94,15 +94,15 @@ - (void)sendSyncMethodBlocking:(id<RMQMethod>)method {
 
     [self.commandQueue blockingEnqueue:^{
         RMQFramesetValidationResult *result = [self.validator expect:method.syncResponse];
-        if (result.error) {
+        if (self.state == DispatcherStateOpen && result.error) {
             [self.delegate channel:self.channel error:result.error];
         }
     }];
 }
 
 - (void)sendAsyncFrameset:(RMQFrameset *)frameset {
     [self.commandQueue enqueue:^{
-        [self handleClosure:^{
+        [self handleClosure:frameset.method operation:^{
             [self.sender sendFrameset:frameset];
         }];
     }];
@@ -113,7 +113,7 @@ - (void)sendAsyncMethod:(id<RMQMethod>)method {
 }
 
 - (void)handleFrameset:(RMQFrameset *)frameset {
-    if (self.state != DispatcherStateClosedByServer && [frameset.method isKindOfClass:[RMQChannelClose class]]) {
+    if (self.state != DispatcherStateClosedByServer && [self isClose:frameset.method]) {
         self.state = DispatcherStateClosedByServer;
         [self.sender sendFrameset:[[RMQFrameset alloc] initWithChannelNumber:self.channelNumber
                                                                       method:[RMQChannelCloseOk new]]];
@@ -129,11 +129,12 @@ - (NSNumber *)channelNumber {
     return self.channel.channelNumber;
 }
 
-- (void)handleClosure:(void (^)())operation {
-    if (self.state != DispatcherStateOpen) {
-        [self sendChannelClosedError];
-    } else {
+- (void)handleClosure:(id<RMQMethod>)method
+            operation:(void (^)())operation {
+    if (self.state == DispatcherStateOpen) {
         operation();
+    } else if (![self isClose:method]) {
+        [self sendChannelClosedError];
     }
 }
 
@@ -144,4 +145,8 @@ - (void)sendChannelClosedError {
     [self.delegate channel:self.channel error:error];
 }
 
+- (BOOL)isClose:(id<RMQMethod>)method {
+    return [method isKindOfClass:[RMQChannelClose class]];
+}
+
 @end

RMQClientTests/RMQSuspendResumeDispatcherTest.swift

@@ -76,7 +76,7 @@ class RMQSuspendResumeDispatcherTest: XCTestCase {
     func testAsyncFramesetSendsFrameset() {
         let (dispatcher, q, sender, _, _) = setupActivated()
 
-        let frameset = RMQFrameset(channelNumber: 123, method: MethodFixtures.channelClose())
+        let frameset = RMQFrameset(channelNumber: 123, method: MethodFixtures.basicAck(1, options: []))
         dispatcher.sendAsyncFrameset(frameset)
 
         try! q.step()
@@ -184,6 +184,22 @@ class RMQSuspendResumeDispatcherTest: XCTestCase {
         XCTAssertNil(delegate.lastChannelError)
     }
 
+    func testAdditionalClientClosuresHaveNoEffect() {
+        let (dispatcher, q, sender, delegate, _) = setupActivated()
+
+        dispatcher.sendSyncMethod(MethodFixtures.channelClose())
+        try! q.step()
+        dispatcher.handleFrameset(RMQFrameset(channelNumber: 123, method: MethodFixtures.channelCloseOk()))
+        try! q.step()
+
+        sender.lastSentMethod = nil
+        dispatcher.sendSyncMethodBlocking(MethodFixtures.channelClose())
+        try! q.step()
+
+        XCTAssertNil(delegate.lastChannelError)
+        XCTAssertNil(sender.lastSentMethod)
+    }
+
     // MARK: Server close tests
 
     func testServerCloseCausesCloseOkToBeSentInResponse() {
@@ -223,6 +239,18 @@ class RMQSuspendResumeDispatcherTest: XCTestCase {
         XCTAssertFalse(q.suspended)
     }
 
+    func testClientCloseFollowingServerCloseHasNoEffect() {
+        let (dispatcher, q, sender, delegate, _) = setupActivated()
+        dispatcher.handleFrameset(RMQFrameset(channelNumber: 123, method: MethodFixtures.channelClose()))
+
+        sender.lastSentMethod = nil
+        dispatcher.sendSyncMethodBlocking(MethodFixtures.channelClose())
+        try! q.finish()
+
+        XCTAssertNil(delegate.lastChannelError)
+        XCTAssertNil(sender.lastSentMethod)
+    }
+
     // MARK: Helpers
 
     func setupActivated() -> (dispatcher: RMQSuspendResumeDispatcher, q: FakeSerialQueue, sender: SenderSpy, delegate: ConnectionDelegateSpy, ch: RMQAllocatedChannel) {