Merge pull request ros#531 from ros/remove_queued_connections_correctly

fix removal of QueuedConnection leading to wrong subscriber count

clients/rospy/src/rospy/topics.py

@@ -351,8 +351,17 @@ def _remove_connection(self, connections, c):
             c.close()
         except:
             pass
+        # while c might be a rospy.impl.tcpros_base.TCPROSTransport instance
+        # connections might only contain the rospy.impl.tcpros_pubsub.QueuedConnection proxy
+        # finding the "right" connection is more difficult then
         if c in connections:
             connections.remove(c)
+        # therefore additionally check for fileno equality if available
+        elif c.fileno():
+            matching_connections = [
+                conn for conn in connections if conn.fileno() == c.fileno()]
+            if len(matching_connections) == 1:
+                connections.remove(matching_connections[0])
 
     def add_connection(self, c):
         """