1 files changed, 43 insertions, 24 deletions

diff --git a/qpid/cpp/src/tests/PollerTest.cpp b/qpid/cpp/src/tests/PollerTest.cpp
index 19f641ca36..11337d6be3 100644
--- a/qpid/cpp/src/tests/PollerTest.cpp
+++ b/qpid/cpp/src/tests/PollerTest.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ int writeALot(int fd, const string& s) {
         int lastWrite = ::write(fd, s.c_str(), s.size());
         if ( lastWrite >= 0) {
             bytesWritten += lastWrite;
-        } 
+        }
     } while (errno != EAGAIN);
     return bytesWritten;
 }
@@ -58,32 +58,32 @@ int writeALot(int fd, const string& s) {
 int readALot(int fd) {
     int bytesRead = 0;
     char buf[1024];
-    
+
     do {
         errno = 0;
         int lastRead = ::read(fd, buf, sizeof(buf));
         if ( lastRead >= 0) {
             bytesRead += lastRead;
-        } 
+        }
     } while (errno != EAGAIN);
     return bytesRead;
 }
 
 int main(int /*argc*/, char** /*argv*/)
 {
-    try 
+    try
     {
         int sv[2];
         int rc = ::socketpair(AF_UNIX, SOCK_STREAM, 0, sv);
         assert(rc >= 0);
-        
+
         // Set non-blocking
         rc = ::fcntl(sv[0], F_SETFL, O_NONBLOCK);
         assert(rc >= 0);
 
         rc = ::fcntl(sv[1], F_SETFL, O_NONBLOCK);
         assert(rc >= 0);
-        
+
         // Make up a large string
         string testString = "This is only a test ... 1,2,3,4,5,6,7,8,9,10;";
         for (int i = 0; i < 6; i++)
@@ -97,32 +97,32 @@ int main(int /*argc*/, char** /*argv*/)
         // Write as much as we can to socket 0
         int bytesWritten = writeALot(sv[0], testString);
         cout << "Wrote(0): " << bytesWritten << " bytes\n";
-        
+
         // Read as much as we can from socket 1
         bytesRead = readALot(sv[1]);
         assert(bytesRead == bytesWritten);
         cout << "Read(1): " << bytesRead << " bytes\n";
 
         auto_ptr<Poller> poller(new Poller);
-        
+
         PosixIOHandle f0(sv[0]);
         PosixIOHandle f1(sv[1]);
 
         PollerHandle h0(f0);
         PollerHandle h1(f1);
-        
+
         poller->registerHandle(h0);
         poller->monitorHandle(h0, Poller::INOUT);
-        
+
         // h0 should be writable
         Poller::Event event = poller->wait();
         assert(event.handle == &h0);
         assert(event.type == Poller::WRITABLE);
-        
+
         // Write as much as we can to socket 0
         bytesWritten = writeALot(sv[0], testString);
         cout << "Wrote(0): " << bytesWritten << " bytes\n";
-        
+
         // Wait for 500ms - h0 no longer writable
         event = poller->wait(500000000);
         assert(event.handle == 0);
@@ -133,7 +133,7 @@ int main(int /*argc*/, char** /*argv*/)
         event = poller->wait();
         assert(event.handle == &h1);
         assert(event.type == Poller::READ_WRITABLE);
-        
+
         bytesRead = readALot(sv[1]);
         assert(bytesRead == bytesWritten);
         cout << "Read(1): " << bytesRead << " bytes\n";
@@ -147,11 +147,11 @@ int main(int /*argc*/, char** /*argv*/)
         // Test multiple interrupts
         assert(poller->interrupt(h0) == true);
         assert(poller->interrupt(h1) == true);
-        
+
         // Make sure we can interrupt them again
         assert(poller->interrupt(h0) == true);
         assert(poller->interrupt(h1) == true);
-        
+
         // Make sure that they both come out
         event = poller->wait();
         assert(event.type == Poller::INTERRUPTED);
@@ -170,25 +170,44 @@ int main(int /*argc*/, char** /*argv*/)
 
         event = poller->wait();
         assert(event.handle == &h0);
-        assert(event.type == Poller::WRITABLE);    
+        assert(event.type == Poller::WRITABLE);
 
         // We didn't write anything so it should still be writable
         event = poller->wait();
         assert(event.handle == &h0);
-        assert(event.type == Poller::WRITABLE);    
+        assert(event.type == Poller::WRITABLE);
 
         poller->unmonitorHandle(h0, Poller::INOUT);
 
         event = poller->wait(500000000);
         assert(event.handle == 0);
-        
+
         poller->unregisterHandle(h1);
+        assert(poller->interrupt(h1) == false);
+
+        // close the other end to force a disconnect
+        ::close(sv[1]);
+
+        // Now make sure that we are readable followed by disconnected
+        // and after that we never return again
+        poller->monitorHandle(h0, Poller::INOUT);
+        event = poller->wait(500000000);
+        assert(event.handle == &h0);
+        assert(event.type == Poller::READABLE);
+        event = poller->wait(500000000);
+        assert(event.handle == &h0);
+        assert(event.type == Poller::DISCONNECTED);
+        event = poller->wait(1500000000);
+        assert(event.handle == 0);
+
+        // Now we're disconnected monitoring should have no effect at all
+        poller->unmonitorHandle(h0, Poller::INOUT);
+        event = poller->wait(1500000000);
+        assert(event.handle == 0);
+
         poller->unregisterHandle(h0);
-        
-        // Make sure we can't interrupt them now
         assert(poller->interrupt(h0) == false);
-        assert(poller->interrupt(h1) == false);
-        
+
         // Test shutdown
         poller->shutdown();
         event = poller->wait();