You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/05/29 10:18:09 UTC

james-project git commit: JAMES-2405 Buffered outputStream for SpamAssassin invoker

Repository: james-project
Updated Branches:
  refs/heads/master 7b38d06c6 -> 0bde59ba8


JAMES-2405 Buffered outputStream for SpamAssassin invoker

This should limit blocking writes as payload can be quite large.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0bde59ba
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0bde59ba
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0bde59ba

Branch: refs/heads/master
Commit: 0bde59ba8dd890bfb00f2bbd8520506ed7675cdc
Parents: 7b38d06
Author: benwa <bt...@linagora.com>
Authored: Tue May 29 08:33:09 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue May 29 12:17:52 2018 +0200

----------------------------------------------------------------------
 .../org/apache/james/util/scanner/SpamAssassinInvoker.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/0bde59ba/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
index 12bb7f2..fe825aa 100644
--- a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
+++ b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.util.scanner;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -111,7 +112,8 @@ public class SpamAssassinInvoker {
     public SpamAssassinResult scanMailWithAdditionalHeaders(MimeMessage message, String... additionalHeaders) throws MessagingException {
         try (Socket socket = new Socket(spamdHost, spamdPort);
              OutputStream out = socket.getOutputStream();
-             PrintWriter writer = new PrintWriter(out);
+             BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(out);
+             PrintWriter writer = new PrintWriter(bufferedOutputStream);
              BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
 
             writer.write("CHECK SPAMC/1.2");
@@ -212,7 +214,8 @@ public class SpamAssassinInvoker {
     private boolean reportMessageAs(InputStream message, String user, MessageClass messageClass) throws MessagingException {
         try (Socket socket = new Socket(spamdHost, spamdPort);
              OutputStream out = socket.getOutputStream();
-             PrintWriter writer = new PrintWriter(out);
+             BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(out);
+             PrintWriter writer = new PrintWriter(bufferedOutputStream);
              BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
 
             byte[] byteArray = IOUtils.toByteArray(message);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org