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 918D56956 for ; Mon, 30 May 2011 10:59:46 +0000 (UTC) Received: (qmail 37435 invoked by uid 500); 30 May 2011 10:59:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 37381 invoked by uid 500); 30 May 2011 10:59:46 -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 37373 invoked by uid 99); 30 May 2011 10:59:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 May 2011 10:59:46 +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, 30 May 2011 10:59:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 42536238897F; Mon, 30 May 2011 10:59:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1129123 - in /cxf/branches/2.3.x-fixes: ./ rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java Date: Mon, 30 May 2011 10:59:25 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110530105925.42536238897F@eris.apache.org> Author: ffang Date: Mon May 30 10:59:24 2011 New Revision: 1129123 URL: http://svn.apache.org/viewvc?rev=1129123&view=rev Log: Merged revisions 1129120 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1129120 | ffang | 2011-05-30 18:31:38 +0800 (δΈ€, 30 5 2011) | 1 line [CXF-3556]javascript AnyTest failed intermittently ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java?rev=1129123&r1=1129122&r2=1129123&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java Mon May 30 10:59:24 2011 @@ -152,7 +152,7 @@ public class AnyTest extends JavascriptR testUtilities.rhinoCallConvert("testAny1ToClientChalk", Notifier.class, testUtilities.javaToJS(getAddress())); - boolean notified = notifier.waitForJavascript(1000 * 10); + boolean notified = notifier.waitForJavascript(1000 * 20); assertTrue(notified); Integer errorStatus = testUtilities.rhinoEvaluateConvert("globalErrorStatus", Integer.class); assertNull(errorStatus);