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 2012/11/15 14:47:57 UTC
svn commit: r1409775 - in /cxf/branches/2.6.x-fixes: ./
api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
Author: ay
Date: Thu Nov 15 13:47:57 2012
New Revision: 1409775
URL: http://svn.apache.org/viewvc?rev=1409775&view=rev
Log:
Merged revisions 1409768 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1409768 | ay | 2012-11-15 14:23:00 +0100 (Thu, 15 Nov 2012) | 1 line
use cipher RC4 for CXF-4596 test
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java?rev=1409775&r1=1409774&r2=1409775&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java Thu Nov 15 13:47:57 2012
@@ -61,7 +61,7 @@ public class CachedOutputStreamTest exte
CachedOutputStream cos = new CachedOutputStream();
cos.setThreshold(4);
// need a 8-bit cipher so that all bytes are flushed when the stream is flushed.
- cos.setCipherTransformation("DES/CFB8/NoPadding");
+ cos.setCipherTransformation("RC4");
final String text = "Hello Secret World!";
cos.write(text.getBytes("UTF-8"));
@@ -91,7 +91,7 @@ public class CachedOutputStreamTest exte
CachedOutputStream cos = new CachedOutputStream();
cos.setThreshold(4);
// need a 8-bit cipher so that all bytes are flushed when the stream is flushed.
- cos.setCipherTransformation("DES/CFB8/NoPadding");
+ cos.setCipherTransformation("RC4");
final String text = "Hello Secret World!";
cos.write(text.getBytes("UTF-8"));