Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 04D789B80 for ; Tue, 28 Feb 2012 18:32:49 +0000 (UTC) Received: (qmail 99314 invoked by uid 500); 28 Feb 2012 18:32:48 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 99245 invoked by uid 500); 28 Feb 2012 18:32:48 -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 99238 invoked by uid 99); 28 Feb 2012 18:32:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 18:32:48 +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; Tue, 28 Feb 2012 18:32:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DA24C23888FD for ; Tue, 28 Feb 2012 18:31:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294760 - /commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java Date: Tue, 28 Feb 2012 18:31:57 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228183157.DA24C23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Tue Feb 28 18:31:57 2012 New Revision: 1294760 URL: http://svn.apache.org/viewvc?rev=1294760&view=rev Log: Clone calendar to ensure original settings are preserved. [Previously, the hour was not reset] Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=1294760&r1=1294759&r2=1294760&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java (original) +++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java Tue Feb 28 18:31:57 2012 @@ -62,13 +62,14 @@ public class FTPTimestampParserImplTest public void testParseTimestampWithSlop() { Calendar cal = Calendar.getInstance(); - cal.add(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.SECOND,0); cal.set(Calendar.MILLISECOND,0); - Date anHourFromNow = cal.getTime(); - cal.add(Calendar.DATE, 1); - Date anHourFromNowTomorrow = cal.getTime(); - cal.add(Calendar.DATE, -1); + + Calendar caltemp = (Calendar) cal.clone(); + caltemp.add(Calendar.HOUR_OF_DAY, 1); + Date anHourFromNow = caltemp.getTime(); + caltemp.add(Calendar.DATE, 1); + Date anHourFromNowTomorrow = caltemp.getTime(); FTPTimestampParserImpl parser = new FTPTimestampParserImpl();