Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F23418EF2 for ; Mon, 7 Mar 2016 10:00:33 +0000 (UTC) Received: (qmail 31224 invoked by uid 500); 7 Mar 2016 10:00:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31165 invoked by uid 500); 7 Mar 2016 10:00:32 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 31156 invoked by uid 99); 7 Mar 2016 10:00:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Mar 2016 10:00:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A7FFDFA0B; Mon, 7 Mar 2016 10:00:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6435]remove unnecessary static modifier Date: Mon, 7 Mar 2016 10:00:32 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master bff065607 -> 41727971d [CXF-6435]remove unnecessary static modifier Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41727971 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41727971 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41727971 Branch: refs/heads/master Commit: 41727971d19254da3027d7c583ac267224f8ae7d Parents: bff0656 Author: Freeman Fang Authored: Mon Mar 7 17:59:38 2016 +0800 Committer: Freeman Fang Committed: Mon Mar 7 17:59:38 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/cxf/attachment/AttachmentSerializer.java | 6 +++--- .../org/apache/cxf/interceptor/AttachmentOutInterceptor.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/41727971/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java index 97e880e..c9878f8 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java @@ -46,7 +46,7 @@ public class AttachmentSerializer { // http://tools.ietf.org/html/rfc2387 private static final String DEFAULT_MULTIPART_TYPE = "multipart/related"; - private static String contentTransferEncoding = "binary"; + private String contentTransferEncoding = "binary"; private Message message; private String bodyBoundary; @@ -186,7 +186,7 @@ public class AttachmentSerializer { return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s; } - public static void setContentTransferEncoding(String cte) { + public void setContentTransferEncoding(String cte) { contentTransferEncoding = cte; } @@ -205,7 +205,7 @@ public class AttachmentSerializer { return sb.toString(); } - private static void writeHeaders(String contentType, String attachmentId, + private void writeHeaders(String contentType, String attachmentId, Map> headers, Writer writer) throws IOException { writer.write("\r\nContent-Type: "); writer.write(contentType); http://git-wip-us.apache.org/repos/asf/cxf/blob/41727971/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java index 16b7d79..8543960 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java @@ -70,7 +70,7 @@ public class AttachmentOutInterceptor extends AbstractPhaseInterceptor String contentTransferEncoding = (String)message.getContextualProperty( org.apache.cxf.message.Message.CONTENT_TRANSFER_ENCODING); if (contentTransferEncoding != null) { - AttachmentSerializer.setContentTransferEncoding(contentTransferEncoding); + serializer.setContentTransferEncoding(contentTransferEncoding); } try {