[camel] branch main updated: camel-grpc - Fix NPE on stop tests

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 9759ec3  camel-grpc - Fix NPE on stop tests
9759ec3 is described below

commit 9759ec32af710a455745ead79b87f7758cd4cef3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Feb 15 21:42:08 2022 +0100

    camel-grpc - Fix NPE on stop tests
---
 .../camel/component/grpc/GrpcConsumerAggregationTest.java    |  8 ++++++--
 .../camel/component/grpc/GrpcConsumerExceptionTest.java      |  4 +++-
 .../camel/component/grpc/GrpcConsumerPropagationTest.java    |  8 ++++++--
 .../camel/component/grpc/GrpcConsumerSecurityTest.java       | 12 +++++++++---
 .../component/grpc/RouteControlledStreamObserverTest.java    |  8 ++++++--
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
index a8c6ceb..3193cac 100644
--- 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
+++ 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
@@ -64,8 +64,12 @@ public class GrpcConsumerAggregationTest extends 
CamelTestSupport {
 
     @AfterEach
     public void stopGrpcChannels() {
-        syncRequestChannel.shutdown().shutdownNow();
-        asyncRequestChannel.shutdown().shutdownNow();
+        if (syncRequestChannel != null) {
+            syncRequestChannel.shutdown().shutdownNow();
+        }
+        if (asyncRequestChannel != null) {
+            asyncRequestChannel.shutdown().shutdownNow();
+        }
     }
 
     @Test
diff --git 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
index 734f1f7..ecce0df 100644
--- 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
+++ 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
@@ -58,7 +58,9 @@ public class GrpcConsumerExceptionTest extends 
CamelTestSupport {
 
     @AfterEach
     public void stopGrpcChannels() {
-        syncRequestChannel.shutdown().shutdownNow();
+        if (syncRequestChannel != null) {
+            syncRequestChannel.shutdown().shutdownNow();
+        }
     }
 
     @Test
diff --git 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
index 958ac92..57c1ffe 100644
--- 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
+++ 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
@@ -62,8 +62,12 @@ public class GrpcConsumerPropagationTest extends 
CamelTestSupport {
 
     @AfterEach
     public void stopGrpcChannels() throws Exception {
-        asyncOnNextChannel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
-        asyncOnCompletedChannel.shutdown().awaitTermination(5, 
TimeUnit.SECONDS);
+        if (asyncOnNextChannel != null) {
+            asyncOnNextChannel.shutdown().awaitTermination(5, 
TimeUnit.SECONDS);
+        }
+        if (asyncOnCompletedChannel != null) {
+            asyncOnCompletedChannel.shutdown().awaitTermination(5, 
TimeUnit.SECONDS);
+        }
     }
 
     @Test
diff --git 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
index b8098ec..aa2be6e 100644
--- 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
+++ 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
@@ -96,9 +96,15 @@ public class GrpcConsumerSecurityTest extends 
CamelTestSupport {
 
     @AfterEach
     public void stopGrpcChannels() throws Exception {
-        tlsChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
-        jwtCorrectChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
-        jwtIncorrectChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
+        if (tlsChannel != null) {
+            tlsChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
+        }
+        if (jwtCorrectChannel != null) {
+            jwtCorrectChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
+        }
+        if (jwtIncorrectChannel != null) {
+            jwtIncorrectChannel.shutdown().awaitTermination(1, 
TimeUnit.SECONDS);
+        }
     }
 
     @Test
diff --git 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
index 238f151..c1366a5 100644
--- 
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
+++ 
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
@@ -67,8 +67,12 @@ public class RouteControlledStreamObserverTest extends 
CamelTestSupport {
 
     @AfterEach
     public void stopGrpcChannels() {
-        syncRequestChannel.shutdown().shutdownNow();
-        asyncRequestChannel.shutdown().shutdownNow();
+        if (syncRequestChannel != null) {
+            syncRequestChannel.shutdown().shutdownNow();
+        }
+        if (asyncRequestChannel != null) {
+            asyncRequestChannel.shutdown().shutdownNow();
+        }
     }
 
     @Test