Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 99395 invoked from network); 21 Jan 2010 18:29:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Jan 2010 18:29:00 -0000 Received: (qmail 49701 invoked by uid 500); 21 Jan 2010 18:29:00 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 49623 invoked by uid 500); 21 Jan 2010 18:29:00 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 49614 invoked by uid 99); 21 Jan 2010 18:28:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jan 2010 18:28:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 21 Jan 2010 18:28:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0474323889B8; Thu, 21 Jan 2010 18:28:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r901818 - /commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java Date: Thu, 21 Jan 2010 18:28:38 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100121182839.0474323889B8@eris.apache.org> Author: sebb Date: Thu Jan 21 18:28:38 2010 New Revision: 901818 URL: http://svn.apache.org/viewvc?rev=901818&view=rev Log: Drop use of nanoTime() now that testing is complete Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java?rev=901818&r1=901817&r2=901818&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java (original) +++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java Thu Jan 21 18:28:38 2010 @@ -789,7 +789,7 @@ + ". Loops: " + pt.loops + ". State: " + pt.state + ". thrown: "+ pt.thrown - + ". (using nanoTime)" + + "." ); } } @@ -909,6 +909,6 @@ } long timeStamp() { - return System.nanoTime() / 1000000; + return System.currentTimeMillis();// JVM 1.5+ System.nanoTime() / 1000000; } }