You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2016/03/07 11:00:32 UTC
cxf git commit: [CXF-6435]remove unnecessary static modifier
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 <fr...@gmail.com>
Authored: Mon Mar 7 17:59:38 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
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<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/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<Message>
String contentTransferEncoding = (String)message.getContextualProperty(
org.apache.cxf.message.Message.CONTENT_TRANSFER_ENCODING);
if (contentTransferEncoding != null) {
- AttachmentSerializer.setContentTransferEncoding(contentTransferEncoding);
+ serializer.setContentTransferEncoding(contentTransferEncoding);
}
try {