svn commit: r1414962 - in /cxf/trunk/api/src: main/java/org/apache/cxf/io/CachedOutputStream.java test/java/org/apache/cxf/io/CachedOutputStreamTest.java

[ay]

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);
         }
     }