SWS-333

Author: poutsma

core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java

@@ -47,17 +47,6 @@ protected final TransportOutputStream createTransportOutputStream() throws IOExc
         return responseOutputStream;
     }
 
-    public final void close() throws IOException {
-        try {
-            if (requestInputStream != null) {
-                requestInputStream.close();
-            }
-        }
-        finally {
-            onClose();
-        }
-    }
-
     /**
      * Template method invoked from {@link #close()}. Default implementation is empty.
      *
@@ -108,11 +97,6 @@ public Iterator getHeaders(String name) throws IOException {
             return getRequestHeaders(name);
         }
 
-        public void close() throws IOException {
-            // defer close, some SoapMessage implementations (Axis) lazy-initialize the SOAPMessage
-        }
-
-
     }
 
     /** Implementation of <code>TransportOutputStream</code> for sending-side connections. */

core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java

@@ -52,17 +52,6 @@ protected final TransportInputStream createTransportInputStream() throws IOExcep
         }
     }
 
-    public final void close() throws IOException {
-        try {
-            if (responseInputStream != null) {
-                responseInputStream.close();
-            }
-        }
-        finally {
-            onClose();
-        }
-    }
-
     /**
      * Template method invoked from {@link #close()}. Default implementation is empty.
      *
@@ -128,10 +117,6 @@ public Iterator getHeaders(String name) throws IOException {
             return getResponseHeaders(name);
         }
 
-        public void close() throws IOException {
-            // defer close, some SoapMessage implementations (Axis) lazy-initialize the SOAPMessage
-        }
-
     }
 
 }

core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java

@@ -29,34 +29,31 @@
  */
 public abstract class AbstractWebServiceConnection implements WebServiceConnection {
 
+    private TransportInputStream tis;
+
+    private TransportOutputStream tos;
+
     public final void send(WebServiceMessage message) throws IOException {
         onSendBeforeWrite(message);
-        TransportOutputStream tos = createTransportOutputStream();
-        try {
-            message.writeTo(tos);
-            tos.flush();
-        }
-        finally {
-            tos.close();
+        tos = createTransportOutputStream();
+        if (tos == null) {
+            return;
         }
+        message.writeTo(tos);
+        tos.flush();
         onSendAfterWrite(message);
     }
 
-    public final WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException {
-        onReceiveBeforeRead();
-        TransportInputStream tis = createTransportInputStream();
-        if (tis == null) {
-            return null;
-        }
-        WebServiceMessage message = null;
-        try {
-            message = messageFactory.createWebServiceMessage(tis);
-        }
-        finally {
-            tis.close();
-        }
-        onReceiveAfterRead(message);
-        return message;
+    /**
+     * Called before the given message has been written to the <code>TransportOutputStream</code>. Called from {@link
+     * #send(WebServiceMessage)}.
+     * <p/>
+     * Default implementation does nothing.
+     *
+     * @param message the message
+     * @throws IOException when an I/O exception occurs
+     */
+    protected void onSendBeforeWrite(WebServiceMessage message) throws IOException {
     }
 
     /**
@@ -69,27 +66,37 @@ public final WebServiceMessage receive(WebServiceMessageFactory messageFactory)
     protected abstract TransportOutputStream createTransportOutputStream() throws IOException;
 
     /**
-     * Called before the given message has been written to the <code>TransportOutputStream</code>. Called from {@link
+     * Called after the given message has been written to the <code>TransportOutputStream</code>. Called from {@link
      * #send(WebServiceMessage)}.
      * <p/>
      * Default implementation does nothing.
      *
      * @param message the message
      * @throws IOException when an I/O exception occurs
      */
-    protected void onSendBeforeWrite(WebServiceMessage message) throws IOException {
+    protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
+    }
+
+    public final WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException {
+        onReceiveBeforeRead();
+        tis = createTransportInputStream();
+        if (tis == null) {
+            return null;
+        }
+        WebServiceMessage message = messageFactory.createWebServiceMessage(tis);
+        onReceiveAfterRead(message);
+        return message;
     }
 
     /**
-     * Called after the given message has been written to the <code>TransportOutputStream</code>. Called from {@link
-     * #send(WebServiceMessage)}.
+     * Called before a message has been read from the <code>TransportInputStream</code>. Called from {@link
+     * #receive(WebServiceMessageFactory)}.
      * <p/>
      * Default implementation does nothing.
      *
-     * @param message the message
      * @throws IOException when an I/O exception occurs
      */
-    protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
+    protected void onReceiveBeforeRead() throws IOException {
     }
 
     /**
@@ -101,26 +108,47 @@ protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
     protected abstract TransportInputStream createTransportInputStream() throws IOException;
 
     /**
-     * Called before a message has been read from the <code>TransportInputStream</code>. Called from {@link
+     * Called when the given message has been read from the <code>TransportInputStream</code>. Called from {@link
      * #receive(WebServiceMessageFactory)}.
      * <p/>
      * Default implementation does nothing.
      *
+     * @param message the message
      * @throws IOException when an I/O exception occurs
      */
-    protected void onReceiveBeforeRead() throws IOException {
+    protected void onReceiveAfterRead(WebServiceMessage message) throws IOException {
+    }
+
+    public final void close() throws IOException {
+        IOException ioex = null;
+        if (tis != null) {
+            try {
+                tis.close();
+            }
+            catch (IOException ex) {
+                ioex = ex;
+            }
+        }
+        if (tos != null) {
+            try {
+                tos.close();
+            }
+            catch (IOException ex) {
+                ioex = ex;
+            }
+        }
+        onClose();
+        if (ioex != null) {
+            throw ioex;
+        }
     }
 
     /**
-     * Called when the given message has been read from the <code>TransportInputStream</code>. Called from {@link
-     * #receive(WebServiceMessageFactory)}.
-     * <p/>
-     * Default implementation does nothing.
+     * Template method invoked from {@link #close()}. Default implementation is empty.
      *
-     * @param message the message
-     * @throws IOException when an I/O exception occurs
+     * @throws IOException if an I/O error occurs when closing this connection
      */
-    protected void onReceiveAfterRead(WebServiceMessage message) throws IOException {
+    protected void onClose() throws IOException {
     }
 
 }

core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java

@@ -77,7 +77,8 @@ public URI getUri() throws URISyntaxException {
             throw new URISyntaxException("", ex.getMessage());
         }
     }
-/*
+
+    /*
      * Sending request
      */