From 8eac3fed03c25533581558d6231c71a77b15d68d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 22 Mar 2021 11:38:41 +0100
Subject: [PATCH] Fix SingleEntityExecution when a single element is emitted.

We now correctly exit the handler to avoid element emission followed by an error signal.

Closes #1107
---
 .../repository/query/ReactiveCassandraQueryExecution.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java
index 782d5fe18..21b23a234 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java
@@ -150,6 +150,7 @@ interface ReactiveCassandraQueryExecution {
 
 				if (objects.size() == 1 || limiting) {
 					sink.next(objects.get(0));
+					return;
 				}
 
 				sink.error(new IncorrectResultSizeDataAccessException(1, objects.size()));