You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/11/20 09:49:58 UTC
[karaf-cave] branch master updated: [KARAF-6524] Cleanly destroy
CXF server in the Cave REST servlets
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cave.git
The following commit(s) were added to refs/heads/master by this push:
new 7a46607 [KARAF-6524] Cleanly destroy CXF server in the Cave REST servlets
new 7579bb1 Merge pull request #31 from jbonofre/KARAF-6524
7a46607 is described below
commit 7a46607b50386398b5b5d2c8b660ee4972f1ff29
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Nov 20 06:27:47 2019 +0100
[KARAF-6524] Cleanly destroy CXF server in the Cave REST servlets
---
.../cave/deployer/service/rest/DeployerRestServlet.java | 12 +++++++++++-
.../gateway/service/rest/FeaturesGatewayRestServlet.java | 13 ++++++++++++-
.../cave/repository/service/rest/RepositoryRestServlet.java | 13 ++++++++++++-
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/deployer/service/src/main/java/org/apache/karaf/cave/deployer/service/rest/DeployerRestServlet.java b/deployer/service/src/main/java/org/apache/karaf/cave/deployer/service/rest/DeployerRestServlet.java
index 6f63e30..8fefe63 100644
--- a/deployer/service/src/main/java/org/apache/karaf/cave/deployer/service/rest/DeployerRestServlet.java
+++ b/deployer/service/src/main/java/org/apache/karaf/cave/deployer/service/rest/DeployerRestServlet.java
@@ -18,6 +18,7 @@ package org.apache.karaf.cave.deployer.service.rest;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
import org.apache.cxf.transport.http.DestinationRegistry;
@@ -29,6 +30,7 @@ import javax.servlet.ServletException;
public class DeployerRestServlet extends CXFNonSpringServlet {
private DeployerRestApi restApi;
+ private Server server;
public DeployerRestServlet(DeployerRestApi restApi, DestinationRegistry destinationRegistry, Bus bus) {
super(destinationRegistry, false);
@@ -45,8 +47,16 @@ public class DeployerRestServlet extends CXFNonSpringServlet {
bean.setBus(getBus());
bean.setProvider(new JacksonJsonProvider());
bean.setServiceBean(restApi);
- bean.create();
+ server = bean.create();
}
}
+ @Override
+ public void destroy() {
+ if (server != null) {
+ server.destroy();
+ }
+ super.destroy();
+ }
+
}
diff --git a/gateway/service/src/main/java/org/apache/karaf/cave/gateway/service/rest/FeaturesGatewayRestServlet.java b/gateway/service/src/main/java/org/apache/karaf/cave/gateway/service/rest/FeaturesGatewayRestServlet.java
index df973f7..782e39a 100644
--- a/gateway/service/src/main/java/org/apache/karaf/cave/gateway/service/rest/FeaturesGatewayRestServlet.java
+++ b/gateway/service/src/main/java/org/apache/karaf/cave/gateway/service/rest/FeaturesGatewayRestServlet.java
@@ -18,6 +18,7 @@ package org.apache.karaf.cave.gateway.service.rest;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
@@ -29,6 +30,8 @@ public class FeaturesGatewayRestServlet extends CXFNonSpringServlet {
private FeaturesGatewayRestApi restApi;
+ private Server server;
+
public FeaturesGatewayRestServlet(FeaturesGatewayRestApi restApi, DestinationRegistry destinationRegistry, Bus bus) {
super(destinationRegistry, false);
this.restApi = restApi;
@@ -44,8 +47,16 @@ public class FeaturesGatewayRestServlet extends CXFNonSpringServlet {
bean.setBus(getBus());
bean.setProvider(new JacksonJsonProvider());
bean.setServiceBean(restApi);
- bean.create();
+ server = bean.create();
+ }
+ }
+
+ @Override
+ public void destroy() {
+ if (server != null) {
+ server.destroy();
}
+ super.destroy();
}
}
diff --git a/repository/service/src/main/java/org/apache/karaf/cave/repository/service/rest/RepositoryRestServlet.java b/repository/service/src/main/java/org/apache/karaf/cave/repository/service/rest/RepositoryRestServlet.java
index 949d7cf..20fb3e4 100644
--- a/repository/service/src/main/java/org/apache/karaf/cave/repository/service/rest/RepositoryRestServlet.java
+++ b/repository/service/src/main/java/org/apache/karaf/cave/repository/service/rest/RepositoryRestServlet.java
@@ -19,6 +19,7 @@ package org.apache.karaf.cave.repository.service.rest;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
@@ -30,6 +31,8 @@ public class RepositoryRestServlet extends CXFNonSpringServlet {
private RepositoryRestApi restApi;
+ private Server server;
+
public RepositoryRestServlet(RepositoryRestApi restApi, DestinationRegistry destinationRegistry, Bus bus) {
super(destinationRegistry, false);
this.restApi = restApi;
@@ -45,8 +48,16 @@ public class RepositoryRestServlet extends CXFNonSpringServlet {
bean.setBus(getBus());
bean.setProvider(new JacksonJsonProvider());
bean.setServiceBean(restApi);
- bean.create();
+ server = bean.create();
+ }
+ }
+
+ @Override
+ public void destroy() {
+ if (server != null) {
+ server.destroy();
}
+ super.destroy();
}
}