Index: src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java =================================================================== --- src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java (revision 633726) +++ src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java (working copy) @@ -72,9 +72,16 @@ */ public Calendar parseTimestamp(String timestampStr) throws ParseException { Calendar now = Calendar.getInstance(); + return parseTimestamp(timestampStr, now); + } + + /* + * Package-private method to allow unit testing with arbitratry times + */ + Calendar parseTimestamp(String timestampStr, Calendar now) throws ParseException { now.setTimeZone(this.getServerTimeZone()); - Calendar working = Calendar.getInstance(); + Calendar working = (Calendar) now.clone(); working.setTimeZone(getServerTimeZone()); ParsePosition pp = new ParsePosition(0);