Author: norman
Date: Sat Jan 6 09:27:00 2007
New Revision: 493515
URL: http://svn.apache.org/viewvc?view=rev&rev=493515
Log:
Add shutdownSocket to IOUtil. Thx to Kev Jackson for the patch. See JAMES-728
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
james/server/trunk/src/java/org/apache/james/util/io/IOUtil.java
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java?view=diff&rev=493515&r1=493514&r2=493515
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
Sat Jan 6 09:27:00 2007
@@ -21,6 +21,7 @@
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;
@@ -681,31 +682,11 @@
log("Exception caught calling CLAMD on " + socket.getInetAddress()
+ ": " + ex.getMessage(), ex);
throw new MessagingException("Exception caught", ex);
} finally {
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (Throwable t) {}
- try {
- if (writer != null) {
- writer.close();
- }
- } catch (Throwable t) {}
- try {
- if (bos != null) {
- bos.close();
- }
- } catch (Throwable t) {}
- try {
- if (streamSocket != null) {
- streamSocket.close();
- }
- } catch (Throwable t) {}
- try {
- if (socket != null) {
- socket.close();
- }
- } catch (Throwable t) {}
+ IOUtil.shutdownReader(reader);
+ IOUtil.shutdownWriter(writer);
+ IOUtil.shutdownStream(bos);
+ IOUtil.shutdownSocket(streamSocket);
+ IOUtil.shutdownSocket(socket);
}
}
Modified: james/server/trunk/src/java/org/apache/james/util/io/IOUtil.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/util/io/IOUtil.java?view=diff&rev=493515&r1=493514&r2=493515
==============================================================================
--- james/server/trunk/src/java/org/apache/james/util/io/IOUtil.java (original)
+++ james/server/trunk/src/java/org/apache/james/util/io/IOUtil.java Sat Jan 6
09:27:00 2007
@@ -33,6 +33,7 @@
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
+import java.net.Socket;
/**
* General IO Stream manipulation.
@@ -207,6 +208,22 @@
}
catch( final IOException ioe )
{
+ }
+ }
+
+ /**
+ * Unconditionally close an <code>InputStream</code>.
+ * Equivalent to [EMAIL PROTECTED] Socket#close()}, except any exceptions
will be ignored.
+ * @param input A (possibly null) InputStream
+ */
+ public static void shutdownSocket( final Socket socket ) {
+ if( null == socket ) {
+ return;
+ }
+
+ try {
+ socket.close();
+ } catch( final IOException ioe ){
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
