Merge branch '5.0.x'

micronaut-projects · Jul 28, 2023 · 51fd0ac · 51fd0ac
2 parents 59a8bf2 + 9641015
commit 51fd0ac
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/kafka/src/main/java/io/micronaut/configuration/kafka/processor/KafkaConsumerProcessor.java b/kafka/src/main/java/io/micronaut/configuration/kafka/processor/KafkaConsumerProcessor.java
@@ -1084,7 +1084,7 @@ private static final class ConsumerState {
         final boolean useSendOffsetsToTransaction;
         final boolean isMessageReturnType;
         final boolean isMessagesIterableReturnType;
-        ConsumerCloseState closedState;
+        volatile ConsumerCloseState closedState;
 
         private ConsumerState(String clientId, String groupId, OffsetStrategy offsetStrategy, Consumer<?, ?> consumer, Object consumerBean, Set<String> subscriptions,
                               AnnotationValue<KafkaListener> kafkaListener, ExecutableMethod<?, ?> method) {

diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/kafka/docs/MyTest.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/kafka/docs/MyTest.groovy
@@ -4,14 +4,12 @@ import io.micronaut.configuration.kafka.annotation.*
 import io.micronaut.context.annotation.*
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import jakarta.inject.Inject
-import spock.lang.Ignore
 
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.awaitility.Awaitility.await
 
 @Property(name = "spec.name", value = "MyTest")
 @MicronautTest
-@Ignore("It hangs forever in the CI")
 class MyTest extends AbstractKafkaTest {
 
     @Inject

diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/kafka/docs/MyTest.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/kafka/docs/MyTest.kt
@@ -10,7 +10,6 @@ import java.util.concurrent.*
 @Property(name = "spec.name", value = "MyTest")
 @MicronautTest
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Disabled("It hangs forever in the CI")
 internal class MyTest : AbstractKafkaTest() {
     @Test
     fun testKafkaRunning(producer: MyProducer, consumer: MyConsumer) {

diff --git a/test-suite/src/test/java/io/micronaut/kafka/docs/MyTest.java b/test-suite/src/test/java/io/micronaut/kafka/docs/MyTest.java
@@ -11,7 +11,6 @@
 @Property(name = "spec.name", value = "MyTest")
 @MicronautTest
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Disabled("It hangs forever in the CI")
 class MyTest extends AbstractKafkaTest {
     @Test
     void testKafkaRunning(MyProducer producer, MyConsumer consumer) {