You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ay...@apache.org on 2013/12/06 13:45:57 UTC

svn commit: r1548502 - /cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java

Author: ay
Date: Fri Dec  6 12:45:56 2013
New Revision: 1548502

URL: http://svn.apache.org/r1548502
Log:
Merged revisions 1548110 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1548110 | ay | 2013-12-05 13:37:51 +0100 (Thu, 05 Dec 2013) | 10 lines

  Merged revisions 1548109 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1548109 | ay | 2013-12-05 13:33:09 +0100 (Thu, 05 Dec 2013) | 2 lines

    [CXF-5435] WS-RM's retranmission should call conduit.close(message) after successful retransmission

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java

Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java?rev=1548502&r1=1548501&r2=1548502&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java Fri Dec  6 12:45:56 2013
@@ -472,7 +472,8 @@ public class RetransmissionQueueImpl imp
             // copy saved output stream to new output stream in chunks of 1024
             IOUtils.copyAndCloseInput(bis, os);
             os.flush();
-            os.close();
+            // closing the conduit this way will close the underlining stream that is os.
+            c.close(message);
         } catch (ConnectException ex) {
             //ignore, we'll just resent again later
         } catch (IOException ex) {