This is an automated email from the ASF dual-hosted git repository.
songxiaosheng pushed a commit to branch 3.2.0
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
The following commit(s) were added to refs/heads/3.2.0 by this push:
new c1a462a ⬆️ webservice upgrade dubbo3.2 (#269)
c1a462a is described below
commit c1a462ac7c1c4d6979ae14ac9991578da093f65e
Author: xiaosheng <[email protected]>
AuthorDate: Thu Jan 4 13:46:54 2024 +0800
⬆️ webservice upgrade dubbo3.2 (#269)
* :arrow_up: webservice upgrade dubbo3.2
* :arrow_up: webservice upgrade dubbo3.2
---
dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml | 28 +++++++++++++++++++++-
.../protocol/webservice/WebServiceProtocol.java | 11 ++++++---
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
index 8539b04..5941d07 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
@@ -26,21 +26,47 @@
<artifactId>dubbo-rpc-webservice</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<description>The webservice rpc module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <dubbo.version>3.2.9</dubbo.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-core-spi</artifactId>
+ <version>${dubbo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-api</artifactId>
<optional>true</optional>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-http</artifactId>
<optional>true</optional>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git
a/dubbo-rpc-extensions/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
b/dubbo-rpc-extensions/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
index f47cdc2..1523b60 100644
---
a/dubbo-rpc-extensions/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
+++
b/dubbo-rpc-extensions/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
@@ -167,12 +167,12 @@ public class WebServiceProtocol extends
AbstractProxyProtocol {
return super.getErrorCode(e);
}
- private class WebServiceHandler implements HttpHandler {
+ private class WebServiceHandler implements HttpHandler<HttpServletRequest,
HttpServletResponse> {
private volatile ServletController servletController;
@Override
- public void handle(HttpServletRequest request, HttpServletResponse
response) throws IOException, ServletException {
+ public void handle(HttpServletRequest request, HttpServletResponse
response) throws IOException {
if (servletController == null) {
HttpServlet httpServlet = DispatcherServlet.getInstance();
if (httpServlet == null) {
@@ -192,9 +192,14 @@ public class WebServiceProtocol extends
AbstractProxyProtocol {
}
}
RpcContext.getContext().setRemoteAddress(request.getRemoteAddr(),
request.getRemotePort());
- servletController.invoke(request, response);
+ try {
+ servletController.invoke(request, response);
+ } catch (ServletException e) {
+ throw new RuntimeException(e);
+ }
}
+
}
private class URLHashMethodNameSoapActionServiceConfiguration extends
AbstractServiceConfiguration {
