From dc4703923d63cf4950cf2ec20812e6e9086bc305 Mon Sep 17 00:00:00 2001
From: Jonathan Roques <jonathan.roques@camunda.com>
Date: Thu, 23 Jan 2025 17:10:41 +0100
Subject: [PATCH] fix(kafka): remove global consumer and autoclose it

---
 .../kafka/inbound/KafkaConnectorConsumer.java       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorConsumer.java b/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorConsumer.java
index 9219d2190b..7b40c2b0af 100644
--- a/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorConsumer.java
+++ b/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorConsumer.java
@@ -96,19 +96,6 @@ public void startConsumer() {
             return null;
           } catch (Exception ex) {
             LOG.error("Consumer loop failure, retry pending: {}", ex.getMessage(), ex);
-<<<<<<< Updated upstream
-            try {
-              if (consumer != null) {
-                consumer.close();
-              }
-            } catch (Exception e) {
-              LOG.error(
-                  "Failed to close consumer before retrying, reason: {}. "
-                      + "This error will be ignored. If the consumer is still running, it will be disconnected after max.poll.interval.ms.",
-                  e.getMessage());
-            }
-=======
->>>>>>> Stashed changes
             throw ex;
           }
         };