You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2019/06/27 01:05:17 UTC
[servicecomb-java-chassis] branch master updated:
[SCB-1289]restTemplate transmission parameter is empty protection
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new f91024c [SCB-1289]restTemplate transmission parameter is empty protection
f91024c is described below
commit f91024cb5d3a943357da9d5596da8e28c8e7d622
Author: pengliang <pe...@huawei.com>
AuthorDate: Wed Jun 19 15:30:48 2019 +0800
[SCB-1289]restTemplate transmission parameter is empty protection
---
.../servicecomb/provider/springmvc/reference/CseClientHttpRequest.java | 3 ++-
.../reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java | 2 +-
.../reference/TestUrlWithServiceNameClientHttpRequestFactory.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
index 0361206..9c8f985 100644
--- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
+++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java
@@ -185,8 +185,9 @@ public class CseClientHttpRequest implements ClientHttpRequest {
InvocationFactory.forConsumer(requestMeta.getReferenceConfig(),
requestMeta.getOperationMeta(),
args);
+
invocation.getHandlerContext().put(RestConst.REST_CLIENT_REQUEST_PATH,
- path + "?" + this.uri.getRawQuery());
+ path + (this.uri.getRawQuery() == null ? "" : "?" + this.uri.getRawQuery()));
if (context != null) {
invocation.addContext(context);
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
index c666841..4483540 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
@@ -75,6 +75,6 @@ public class TestUrlWithProviderPrefixClientHttpRequestFactory {
Deencapsulation.invoke(request, "invoke", new Object[] {new Object[] {}});
- Assert.assertEquals("/v1/path?null", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
+ Assert.assertEquals("/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
index 0ba928e..2442945 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
@@ -74,6 +74,6 @@ public class TestUrlWithServiceNameClientHttpRequestFactory {
Deencapsulation.invoke(request, "invoke", new Object[] {new Object[] {}});
- Assert.assertEquals("/ms/v1/path?null", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
+ Assert.assertEquals("/ms/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
}
}