Author: rdonkin
Date: Wed May 7 12:59:05 2008
New Revision: 654238
URL: http://svn.apache.org/viewvc?rev=654238&view=rev
Log:
Inline trivial calls to utility.
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java?rev=654238&r1=654237&r2=654238&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
Wed May 7 12:59:05 2008
@@ -21,7 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.james.util.io.IOUtil;
import org.apache.mailet.RFC2822Headers;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
@@ -34,9 +33,12 @@
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.Reader;
import java.io.StringWriter;
+import java.io.Writer;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.Socket;
@@ -682,16 +684,98 @@
log("Exception caught calling CLAMD on " + socket.getInetAddress()
+ ": " + ex.getMessage(), ex);
throw new MessagingException("Exception caught", ex);
} finally {
- IOUtil.shutdownReader(reader);
- IOUtil.shutdownWriter(writer);
- IOUtil.shutdownStream(bos);
- IOUtil.shutdownSocket(streamSocket);
- IOUtil.shutdownSocket(socket);
+ shutdownReader(reader);
+ shutdownWriter(writer);
+ shutdownStream(bos);
+ shutdownSocket(streamSocket);
+ shutdownSocket(socket);
}
}
/**
+ * Unconditionally close an <code>OutputStream</code>.
+ * Equivalent to [EMAIL PROTECTED] OutputStream#close()}, except any
exceptions will be ignored.
+ * @param output A (possibly null) OutputStream
+ */
+ private static void shutdownStream( final OutputStream output )
+ {
+ if( null == output )
+ {
+ return;
+ }
+
+ try
+ {
+ output.close();
+ }
+ catch( final IOException ioe )
+ {
+ }
+ }
+
+ /**
+ * Unconditionally close an <code>Socket</code>.
+ * Equivalent to [EMAIL PROTECTED] Socket#close()}, except any exceptions
will be ignored.
+ * @param socket A (possibly null) Socket
+ */
+ private static void shutdownSocket( final Socket socket ) {
+ if( null == socket ) {
+ return;
+ }
+
+ try {
+ socket.close();
+ } catch( final IOException ioe ){
+ }
+ }
+
+ /**
+ * Unconditionally close an <code>Writer</code>.
+ * Equivalent to [EMAIL PROTECTED] Writer#close()}, except any exceptions
will be ignored.
+ *
+ * @param output A (possibly null) Writer
+ */
+ private void shutdownWriter( final Writer output )
+ {
+ if( null == output )
+ {
+ return;
+ }
+
+ try
+ {
+ output.close();
+ }
+ catch( final IOException ioe )
+ {
+ }
+ }
+
+
+ /**
+ * Unconditionally close an <code>Reader</code>.
+ * Equivalent to [EMAIL PROTECTED] Reader#close()}, except any exceptions
will be ignored.
+ *
+ * @param input A (possibly null) Reader
+ */
+ private void shutdownReader( final Reader input )
+ {
+ if( null == input )
+ {
+ return;
+ }
+
+ try
+ {
+ input.close();
+ }
+ catch( final IOException ioe )
+ {
+ }
+ }
+
+ /**
* Tries to "ping" all the CLAMD daemons to
* check if they are up and accepting requests.
**/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
