You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2016/03/16 16:06:00 UTC
[06/10] cxf git commit: [CXF-6435]remove unnecessary static modifier
[CXF-6435]remove unnecessary static modifier
(cherry picked from commit 41727971d19254da3027d7c583ac267224f8ae7d)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a0177b07
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a0177b07
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a0177b07
Branch: refs/heads/3.0.x-fixes
Commit: a0177b07ec3d2fb96ccbf19861e13ac25ea426d1
Parents: 636929f
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Mar 7 17:59:38 2016 +0800
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 16 11:01:43 2016 -0400
----------------------------------------------------------------------
.../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/a0177b07/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 34402dc..44f5566 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -45,7 +45,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;
@@ -185,7 +185,7 @@ public class AttachmentSerializer {
return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
}
- public static void setContentTransferEncoding(String cte) {
+ public void setContentTransferEncoding(String cte) {
contentTransferEncoding = cte;
}
@@ -204,7 +204,7 @@ public class AttachmentSerializer {
return sb.toString();
}
- private static void writeHeaders(String contentType, String attachmentId,
+ private void writeHeaders(String contentType, String attachmentId,
Map<String, List<String>> headers, Writer writer) throws IOException {
writer.write("\r\nContent-Type: ");
writer.write(contentType);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a0177b07/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<Message>
String contentTransferEncoding = (String)message.getContextualProperty(
org.apache.cxf.message.Message.CONTENT_TRANSFER_ENCODING);
if (contentTransferEncoding != null) {
- AttachmentSerializer.setContentTransferEncoding(contentTransferEncoding);
+ serializer.setContentTransferEncoding(contentTransferEncoding);
}
try {