Author: dkulp Date: Fri Jun 29 14:54:00 2012 New Revision: 1355422 URL: http://svn.apache.org/viewvc?rev=1355422&view=rev Log: Merged revisions 1355410 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1355410 | dkulp | 2012-06-29 10:34:00 -0400 (Fri, 29 Jun 2012) | 10 lines Merged revisions 1352499 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1352499 | cschneider | 2012-06-21 07:32:23 -0400 (Thu, 21 Jun 2012) | 2 lines Checking for null in constructor to avoid a null pointer exception later ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java?rev=1355422&r1=1355421&r2=1355422&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java Fri Jun 29 14:54:00 2012 @@ -34,6 +34,9 @@ public class CacheAndWriteOutputStream e public CacheAndWriteOutputStream(OutputStream stream) { super(); + if (stream == null) { + throw new IllegalArgumentException("Stream may not be null"); + } flowThroughStream = stream; }
