You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/30 16:49:24 UTC
svn commit: r759995 - in /cxf/branches/2.1.x-fixes: ./
api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Author: dkulp
Date: Mon Mar 30 14:49:24 2009
New Revision: 759995
URL: http://svn.apache.org/viewvc?rev=759995&view=rev
Log:
Merged revisions 759964 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r759964 | dkulp | 2009-03-30 09:36:45 -0400 (Mon, 30 Mar 2009) | 2 lines
Lock the outputstream on close. Prevents double logging of outbound messages
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 14:49:24 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=759995&r1=759994&r2=759995&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original)
+++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Mon Mar 30 14:49:24 2009
@@ -168,6 +168,7 @@
public void close() throws IOException {
currentStream.flush();
+ outputLocked = true;
if (null != callbacks) {
for (CachedOutputStreamCallback cb : callbacks) {
cb.onClose(this);