[prev in list] [next in list] [prev in thread] [next in thread] 

List:       james-dev
Subject:    [05/13] james-project git commit: JAMES-2262 Finally close MockSpamD resources
From:       btellier () apache ! org
Date:       2017-12-25 4:26:49
Message-ID: 05a81b3e8ccc49bcb945ced43dfc6d75 () git ! apache ! org
[Download RAW message or body]

JAMES-2262 Finally close MockSpamD resources


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

Branch: refs/heads/master
Commit: 03b2633bdfaf62eb6bf2841a8bcb10eb6a753a24
Parents: 0be2343
Author: benwa <btellier@linagora.com>
Authored: Mon Dec 18 08:23:46 2017 +0700
Committer: benwa <btellier@linagora.com>
Committed: Mon Dec 25 11:24:28 2017 +0700

----------------------------------------------------------------------
 .../james/smtpserver/mock/util/MockSpamd.java   | 30 +++++++++-----------
 1 file changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/03b2633b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
                
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java \
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
 index 1c0e2a0..a0ff6f9 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
                
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
 @@ -25,6 +25,8 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * This class can be used to run a mocked SPAMD daemon
  */
@@ -36,30 +38,28 @@ public class MockSpamd implements Runnable {
     public final static String GTUBE = "-SPAM-";
     public final static String NOT_SPAM = "Spam: False ; 3 / 5";
     public final static String SPAM = "Spam: True ; 1000 / 5";
-    BufferedReader in;
-    OutputStream out;
-    Socket spamd;
-    ServerSocket socket;
+    private BufferedReader in;
+    private OutputStream out;
+    private Socket spamd;
+    private ServerSocket socket;
+
 
     /**
      * Init the mocked SPAMD daemon
      *
-     * @param port
-     *            The port on which the mocked SPAMD daemon will be bind
      * @throws IOException
      */
     public MockSpamd(int port) throws IOException {
         socket = new ServerSocket(port);
     }
-
+    
     /**
      * @see java.lang.Runnable#run()
      */
     @Override
     public void run() {
-        boolean spam = false;
-
         try {
+            boolean spam = false;
 
             // Accept connections
             spamd = socket.accept();
@@ -82,16 +82,14 @@ public class MockSpamd implements Runnable {
                 out.write(NOT_SPAM.getBytes());
                 out.flush();
             }
-
-            in.close();
-            out.close();
-            spamd.close();
-            socket.close();
-
         } catch (IOException e) {
             // Should not happen
             e.printStackTrace();
+        } finally {
+            IOUtils.closeQuietly(in);
+            IOUtils.closeQuietly(out);
+            IOUtils.closeQuietly(spamd);
+            IOUtils.closeQuietly(socket);
         }
-
     }
 }


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


[prev in list] [next in list] [prev in thread] [next in thread]