Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 47997 invoked from network); 16 Mar 2008 20:20:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2008 20:20:17 -0000 Received: (qmail 86226 invoked by uid 500); 16 Mar 2008 20:20:14 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 86162 invoked by uid 500); 16 Mar 2008 20:20:14 -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 86153 invoked by uid 99); 16 Mar 2008 20:20:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 13:20:13 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 20:19:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 722061A983A; Sun, 16 Mar 2008 13:19:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r637643 - in /commons/proper/net/trunk/src: java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Date: Sun, 16 Mar 2008 20:19:52 -0000 To: commits@commons.apache.org From: rwinston@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080316201953.722061A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwinston Date: Sun Mar 16 13:19:52 2008 New Revision: 637643 URL: http://svn.apache.org/viewvc?rev=637643&view=rev Log: NET-201 Modified: commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Modified: commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=637643&r1=637642&r2=637643&view=diff ============================================================================== --- commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java (original) +++ commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java Sun Mar 16 13:19:52 2008 @@ -91,7 +91,7 @@ + "(\\d+)\\s+" + "(\\S+)\\s+" + "(?:(\\S+(?:\\s\\S+)*)\\s+)?" - + "(\\d+)\\s+" + + "(\\d+(?:,\\s*\\d+)?)\\s+" /* numeric or standard format date Modified: commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java?rev=637643&r1=637642&r2=637643&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java (original) +++ commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Sun Mar 16 13:19:52 2008 @@ -72,7 +72,9 @@ "drwxrwx---+ 23 500 500 0 Jan 10 13:09 testACL", "-rw-r--r-- 1 1 3518644 May 25 12:12 std", "lrwxrwxrwx 1 neeme neeme 23 Mar 2 18:06 macros -> ./../../global/macros/.", - "-rw-r--r-- 1 ftp group with spaces in it as allowed in cygwin see bug 38634 83853 Jan 22 2001 zxJDBC-1.2.4.tar.gz" + "-rw-r--r-- 1 ftp group with spaces in it as allowed in cygwin see bug 38634 83853 Jan 22 2001 zxJDBC-1.2.4.tar.gz", + "crw-r----- 1 root kmem 0, 27 Jan 30 11:42 kmem", //FreeBSD device + "crw------- 1 root sys 109,767 Jul 2 2004 pci@1c,600000:devctl" //Solaris device }; @@ -283,8 +285,8 @@ int pos = 3*access + perm + 1; char permchar = test.charAt(pos); assertEquals("Permission " + test.substring(1,10), - f.hasPermission(access, perm), - permchar != '-' && !Character.isUpperCase(permchar)); + new Boolean(f.hasPermission(access, perm)), + new Boolean(permchar != '-' && !Character.isUpperCase(permchar))); } }