Re-enabled ReplyMessage.responseTo check

JAVA-3061

Author: rozza

driver-core/src/main/com/mongodb/internal/connection/ReplyMessage.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.connection;
 
+import com.mongodb.MongoInternalException;
 import org.bson.BsonBinaryReader;
 import org.bson.codecs.Decoder;
 import org.bson.codecs.DecoderContext;
@@ -25,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.String.format;
+
 /**
  * An OP_REPLY message.
  *
@@ -58,12 +61,10 @@ public ReplyMessage(final ResponseBuffers responseBuffers, final Decoder<T> deco
     }
 
     ReplyMessage(final ReplyHeader replyHeader, final long requestId) {
-// Todo - find out why
-//        if (requestId != replyHeader.getResponseTo()) {
-//            throw new MongoInternalException(format("The responseTo (%d) in the response does not match the requestId (%d) in the "
-//                                                    + "request", replyHeader.getResponseTo(), requestId));
-//        }
-
+        if (requestId != replyHeader.getResponseTo()) {
+            throw new MongoInternalException(format("The responseTo (%d) in the response does not match the requestId (%d) in the "
+                                                    + "request", replyHeader.getResponseTo(), requestId));
+        }
         this.replyHeader = replyHeader;
 
         documents = new ArrayList<T>(replyHeader.getNumberReturned());

driver-core/src/test/unit/com/mongodb/internal/connection/ReplyMessageTest.java

@@ -19,7 +19,6 @@
 import com.mongodb.MongoInternalException;
 import org.bson.ByteBufNIO;
 import org.bson.Document;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.nio.Buffer;
@@ -30,7 +29,6 @@
 
 public class ReplyMessageTest {
 
-    @Ignore // Todo - return once embedded ReplyMessage check re-enabled.
     @Test(expected = MongoInternalException.class)
     public void shouldThrowExceptionIfRequestIdDoesNotMatchResponseTo() {
         int badResponseTo = 34565;