[Java] Only respond to response for request correlationId.

aeron-io · Nov 25, 2018 · b727a69 · b727a69
1 parent a9f6f62
commit b727a69
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/aeron-archive/src/main/java/io/aeron/archive/client/AeronArchive.java b/aeron-archive/src/main/java/io/aeron/archive/client/AeronArchive.java
@@ -1040,12 +1040,15 @@ else if (context.errorHandler() != null)
                 }
             }
 
-            if (ControlResponseCode.OK != code)
+            if (poller.correlationId() == correlationId)
             {
-                throw new ArchiveException("unexpected response code: " + code);
-            }
+                if (ControlResponseCode.OK != code)
+                {
+                    throw new ArchiveException("unexpected response code: " + code);
+                }
 
-            return poller.relevantId();
+                return poller.relevantId();
+            }
         }
     }