From a0714d1da3304467d202c501afc460f6b3a6d100 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sun, 19 Jan 2014 14:39:29 +0900 Subject: [PATCH] Revert "+= won't let compile optimize String concats" This reverts commit 4dc78c10eeda86e8fef4bd978fab88c2cfa31fcd. --- .../multipart/HttpPostRequestEncoder.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java index 2838b4d0b1..8fbbfb77a1 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java @@ -559,17 +559,14 @@ public class HttpPostRequestEncoder implements ChunkedInput { .size() - 2); // remove past size globalBodySize -= pastAttribute.size(); - StringBuilder replacement = new StringBuilder().append(HttpPostBodyUtil.CONTENT_DISPOSITION) - .append(": ").append(HttpPostBodyUtil.FORM_DATA).append("; ").append(HttpPostBodyUtil.NAME) - .append("=\"").append(fileUpload.getName()).append("\"\r\n"); - replacement.append(HttpHeaders.Names.CONTENT_TYPE).append(": ") - .append(HttpPostBodyUtil.MULTIPART_MIXED).append("; ").append(HttpHeaders.Values.BOUNDARY) - .append('=').append(multipartMixedBoundary).append("\r\n\r\n"); - replacement.append("--").append(multipartMixedBoundary).append("\r\n"); - replacement.append(HttpPostBodyUtil.CONTENT_DISPOSITION).append(": ").append(HttpPostBodyUtil.FILE) - .append("; ").append(HttpPostBodyUtil.FILENAME).append("=\"") - .append(fileUpload.getFilename()).append("\"\r\n"); - pastAttribute.setValue(replacement.toString(), 1); + String replacement = HttpPostBodyUtil.CONTENT_DISPOSITION + ": " + HttpPostBodyUtil.FORM_DATA + + "; " + HttpPostBodyUtil.NAME + "=\"" + fileUpload.getName() + "\"\r\n"; + replacement += HttpHeaders.Names.CONTENT_TYPE + ": " + HttpPostBodyUtil.MULTIPART_MIXED + "; " + + HttpHeaders.Values.BOUNDARY + '=' + multipartMixedBoundary + "\r\n\r\n"; + replacement += "--" + multipartMixedBoundary + "\r\n"; + replacement += HttpPostBodyUtil.CONTENT_DISPOSITION + ": " + HttpPostBodyUtil.FILE + "; " + + HttpPostBodyUtil.FILENAME + "=\"" + fileUpload.getFilename() + "\"\r\n"; + pastAttribute.setValue(replacement, 1); // update past size globalBodySize += pastAttribute.size();