[incubator-servicecomb-java-chassis] branch master updated: SCB-221 merge vertx 3.5.0 BodyHandlerImpl changes

[li...@apache.org]

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/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new de8b33b  SCB-221 merge vertx 3.5.0 BodyHandlerImpl changes
de8b33b is described below

commit de8b33bbd4a46830107623d09865f7aa3204edb8
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Jan 11 15:10:58 2018 +0800

    SCB-221 merge vertx 3.5.0 BodyHandlerImpl changes
---
 .../io/servicecomb/transport/rest/vertx/RestBodyHandler.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/io/servicecomb/transport/rest/vertx/RestBodyHandler.java b/transports/transport-rest/transport-rest-vertx/src/main/java/io/servicecomb/transport/rest/vertx/RestBodyHandler.java
index 2eb6271..a929012 100644
--- a/transports/transport-rest/transport-rest-vertx/src/main/java/io/servicecomb/transport/rest/vertx/RestBodyHandler.java
+++ b/transports/transport-rest/transport-rest-vertx/src/main/java/io/servicecomb/transport/rest/vertx/RestBodyHandler.java
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.ws.rs.core.Response.Status;
 
+import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.ErrorDataDecoderException;
 import io.servicecomb.swagger.invocation.exception.CommonExceptionData;
 import io.servicecomb.swagger.invocation.exception.ExceptionFactory;
@@ -134,8 +135,14 @@ public class RestBodyHandler implements BodyHandler {
       Set<FileUpload> fileUploads = context.fileUploads();
 
       final String contentType = context.request().getHeader(HttpHeaders.CONTENT_TYPE);
-      isMultipart = contentType != null && contentType.contains("multipart/form-data");
-      isUrlEncoded = contentType != null && contentType.contains("application/x-www-form-urlencoded");
+      if (contentType == null) {
+        isMultipart = false;
+        isUrlEncoded = false;
+      } else {
+        final String lowerCaseContentType = contentType.toLowerCase();
+        isMultipart = lowerCaseContentType.startsWith(HttpHeaderValues.MULTIPART_FORM_DATA.toString());
+        isUrlEncoded = lowerCaseContentType.startsWith(HttpHeaderValues.APPLICATION_X_WWW_FORM_URLENCODED.toString());
+      }
 
       if (isMultipart || isUrlEncoded) {
         makeUploadDir(context.vertx().fileSystem());

-- 
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].