[camel] branch master updated: CAMEL-14956: Ensure managed vertx instances are closed on shutdown

[jamesnetherton]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4efba65  CAMEL-14956: Ensure managed vertx instances are closed on 
shutdown
4efba65 is described below

commit 4efba65ab115c0d8b22134480abef53d1f3c2bc1
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Jul 22 10:45:26 2020 +0100

    CAMEL-14956: Ensure managed vertx instances are closed on shutdown
---
 .../component/vertx/websocket/VertxWebsocketComponent.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git 
a/components/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketComponent.java
 
b/components/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketComponent.java
index 3130542..8f608b2 100644
--- 
a/components/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketComponent.java
+++ 
b/components/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketComponent.java
@@ -49,6 +49,7 @@ public class VertxWebsocketComponent extends DefaultComponent 
implements SSLCont
     private VertxOptions vertxOptions;
     @Metadata(label = "security", defaultValue = "false")
     private boolean useGlobalSslContextParameters;
+    private boolean managedVertx;
 
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, 
Map<String, Object> parameters) throws Exception {
@@ -67,6 +68,16 @@ public class VertxWebsocketComponent extends 
DefaultComponent implements SSLCont
         return endpoint;
     }
 
+    @Override
+    protected void doStop() throws Exception {
+        super.doStop();
+
+        if (managedVertx && vertx != null) {
+            vertx.close();
+        }
+        vertx = null;
+    }
+
     public void connectConsumer(VertxWebsocketConsumer consumer) {
         VertxWebsocketEndpoint endpoint = consumer.getEndpoint();
         VertxWebsocketConfiguration configuration = 
endpoint.getConfiguration();
@@ -126,6 +137,7 @@ public class VertxWebsocketComponent extends 
DefaultComponent implements SSLCont
             } else {
                 vertx = Vertx.vertx();
             }
+            managedVertx = true;
         }
 
         return vertx;