cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject cxf git commit: [CXF-6435]remove unnecessary static modifier
Date Mon, 07 Mar 2016 10:07:59 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e8d4cf77f -> ccaa8a523


[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/ccaa8a52
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ccaa8a52
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ccaa8a52

Branch: refs/heads/3.1.x-fixes
Commit: ccaa8a523ceffa7de9195560c1d69bfd3ef24d5e
Parents: e8d4cf7
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Mon Mar 7 17:59:38 2016 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Mon Mar 7 18:07:25 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/ccaa8a52/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/ccaa8a52/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 {


Mime
View raw message