Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 852E7D53F for ; Wed, 28 Nov 2012 22:09:32 +0000 (UTC) Received: (qmail 36791 invoked by uid 500); 28 Nov 2012 22:09:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36746 invoked by uid 500); 28 Nov 2012 22:09:32 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 36739 invoked by uid 99); 28 Nov 2012 22:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 22:09:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 22:09:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 394472388A91; Wed, 28 Nov 2012 22:09:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1414962 - in /cxf/trunk/api/src: main/java/org/apache/cxf/io/CachedOutputStream.java test/java/org/apache/cxf/io/CachedOutputStreamTest.java Date: Wed, 28 Nov 2012 22:09:08 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121128220909.394472388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Wed Nov 28 22:09:07 2012 New Revision: 1414962 URL: http://svn.apache.org/viewvc?rev=1414962&view=rev Log: use setThreadDefaultBus for CXF-4661 Modified: cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=1414962&r1=1414961&r2=1414962&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Wed Nov 28 22:09:07 2012 @@ -117,7 +117,7 @@ public class CachedOutputStream extends } private void readBusProperties() { - Bus b = BusFactory.getDefaultBus(false); + Bus b = BusFactory.getThreadDefaultBus(false); if (b != null) { String v = getBusProperty(b, "bus.io.CachedOutputStream.Threshold", null); if (v != null && threshold == defaultThreshold) { Modified: cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java?rev=1414962&r1=1414961&r2=1414962&view=diff ============================================================================== --- cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java (original) +++ cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java Wed Nov 28 22:09:07 2012 @@ -121,7 +121,7 @@ public class CachedOutputStreamTest exte @Test public void testUseBusProps() throws Exception { - Bus oldbus = BusFactory.getDefaultBus(false); + Bus oldbus = BusFactory.getThreadDefaultBus(false); try { CachedOutputStream cos = new CachedOutputStream(); cos.write("Hello World!".getBytes()); @@ -136,7 +136,7 @@ public class CachedOutputStreamTest exte EasyMock.expect(b.getProperty("bus.io.CachedOutputStream.MaxSize")).andReturn(null); EasyMock.expect(b.getProperty("bus.io.CachedOutputStream.CipherTransformation")).andReturn(null); - BusFactory.setDefaultBus(b); + BusFactory.setThreadDefaultBus(b); control.replay(); @@ -148,7 +148,7 @@ public class CachedOutputStreamTest exte control.verify(); } finally { - BusFactory.setDefaultBus(oldbus); + BusFactory.setThreadDefaultBus(oldbus); } }