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 2F07AD3AD for ; Mon, 19 Nov 2012 16:48:01 +0000 (UTC) Received: (qmail 68287 invoked by uid 500); 19 Nov 2012 16:48:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67935 invoked by uid 500); 19 Nov 2012 16:47:59 -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 67917 invoked by uid 99); 19 Nov 2012 16:47:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 16:47:59 +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; Mon, 19 Nov 2012 16:47:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 06AFF23888E4; Mon, 19 Nov 2012 16:47:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411297 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java Date: Mon, 19 Nov 2012 16:47:37 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121119164738.06AFF23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {