Merge branch '4.2.x-stable' into 4.3.x-stable

acogoluegnes · acogoluegnes · commit 52580e1666f9 · 2017-09-19T11:31:24.000+02:00
diff --git a/src/main/java/com/rabbitmq/client/RpcClient.java b/src/main/java/com/rabbitmq/client/RpcClient.java
@@ -190,8 +190,10 @@ public void handleDelivery(String consumerTag,
                     throws IOException {
                 synchronized (_continuationMap) {
                     String replyId = properties.getCorrelationId();
-                    BlockingCell<Object> blocker = _continuationMap.get(replyId);
-                    _continuationMap.remove(replyId);
+                    BlockingCell<Object> blocker =_continuationMap.remove(replyId);
+                    if (blocker == null) {
+                        throw new IllegalStateException("No outstanding request for correlation ID " + replyId);
+                    }
                     blocker.set(new Response(consumerTag, envelope, properties, body));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,10 @@ public void handleDelivery(String consumerTag,`
`190`	`190`	`throws IOException {`
`191`	`191`	`synchronized (_continuationMap) {`
`192`	`192`	`String replyId = properties.getCorrelationId();`
`193`		`- BlockingCell<Object> blocker = _continuationMap.get(replyId);`
`194`		`- _continuationMap.remove(replyId);`
	`193`	`+ BlockingCell<Object> blocker =_continuationMap.remove(replyId);`
	`194`	`+ if (blocker == null) {`
	`195`	`+ throw new IllegalStateException("No outstanding request for correlation ID " + replyId);`
	`196`	`+ }`
`195`	`197`	`blocker.set(new Response(consumerTag, envelope, properties, body));`
`196`	`198`	`}`
`197`	`199`	`}`