Author: coheigea Date: Mon Nov 19 16:47:37 2012 New Revision: 1411297 URL: http://svn.apache.org/viewvc?rev=1411297&view=rev Log: Merged revisions 1411290 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1411290 | coheigea | 2012-11-19 16:43:08 +0000 (Mon, 19 Nov 2012) | 10 lines Merged revisions 1411288 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1411288 | coheigea | 2012-11-19 16:37:58 +0000 (Mon, 19 Nov 2012) | 2 lines Lengthening sleep for expired Timestamp test ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java?rev=1411297&r1=1411296&r2=1411297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java Mon Nov 19 16:47:37 2012 @@ -166,7 +166,7 @@ public class WSS4JFaultCodeTest extends // // Sleep for over a second to make the timestamp invalid // - Thread.sleep(1001); + Thread.sleep(1250); inHandler.handleMessage(inmsg); fail("Expected failure on an invalid Timestamp"); } catch (SoapFault fault) {
