Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 89254 invoked from network); 15 Aug 2008 18:08:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2008 18:08:29 -0000 Received: (qmail 76748 invoked by uid 500); 15 Aug 2008 18:08:27 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 76671 invoked by uid 500); 15 Aug 2008 18:08:27 -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 76662 invoked by uid 99); 15 Aug 2008 18:08:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 11:08:27 -0700 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; Fri, 15 Aug 2008 18:07:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B6BC2388988; Fri, 15 Aug 2008 11:08:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r686298 - in /commons/proper/net/branches/NET_2_0/src: main/java/org/apache/commons/net/ftp/FTPClientConfig.java site/xdoc/changes.xml test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java Date: Fri, 15 Aug 2008 18:08:07 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080815180808.2B6BC2388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Fri Aug 15 11:08:07 2008 New Revision: 686298 URL: http://svn.apache.org/viewvc?rev=686298&view=rev Log: NET-230 - ParserInitializationException when connecting to a Unix FTP server: comparison string must be upper case Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?rev=686298&r1=686297&r2=686298&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java Fri Aug 15 11:08:07 2008 @@ -190,9 +190,12 @@ * This may happen if the ftpd in question was compiled without system * information. * + * NET-230 - Updated to be UPPERCASE so that the check done in + * createFileEntryParser will succeed. + * * @since 1.5 */ - public static final String SYST_L8 = "Type: L8"; + public static final String SYST_L8 = "TYPE: L8"; /** * Identifier by which an Netware-based ftp server is known throughout Modified: commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml?rev=686298&r1=686297&r2=686298&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml (original) +++ commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml Fri Aug 15 11:08:07 2008 @@ -168,6 +168,9 @@ the data connection socket is not closed when an IOException occurred + + ParserInitializationException when connecting to a Unix FTP server: comparison string must be upper case + Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java?rev=686298&r1=686297&r2=686298&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java (original) +++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java Fri Aug 15 11:08:07 2008 @@ -62,6 +62,14 @@ parser = factory.createFileEntryParser("OS/400"); assertTrue(parser instanceof CompositeFileEntryParser); + parser = factory.createFileEntryParser("AS/400"); + assertTrue(parser instanceof CompositeFileEntryParser); + + // Added test to make sure it handles the Unix systems that were + // compiled with OS as "UNKNOWN". This test validates that the + // check is case-insensitive. + parser = factory.createFileEntryParser("UNKNOWN Type: L8"); + try { parser = factory.createFileEntryParser("OS2FTPFileEntryParser"); fail("Exception should have been thrown. \"OS2FTPFileEntryParser\" is not a recognized key");