Pull queued messages first, queue messages unless ID matches

mtodd · mtodd · commit 8f4745d4a451 · 2014-10-19T03:01:03.000-07:00
diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb
@@ -356,6 +356,10 @@ def search(args = {})
     result_pdu = nil
     n_results = 0
 
+    @queue ||= {}
+    message_id = next_msgid
+    @queue[message_id] ||= []
+
     instrument "search.net_ldap_connection",
                :filter     => search_filter,
                :base       => search_base,
@@ -403,12 +407,17 @@ def search(args = {})
         controls << sort_control if sort_control
         controls = controls.empty? ? nil : controls.to_ber_contextspecific(0)
 
-        write(request, controls)
+        write(request, controls, message_id)
 
         result_pdu = nil
         controls = []
 
-        while pdu = read
+        while pdu = (@queue[message_id].shift || read)
+          if pdu.message_id != message_id
+            @queue[pdu.message_id].push pdu
+            next
+          end
+
           case pdu.app_tag
           when Net::LDAP::PDU::SearchReturnedData
             n_results += 1
