You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rw...@apache.org on 2009/02/05 01:25:57 UTC
svn commit: r740953 -
/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Author: rwinston
Date: Thu Feb 5 00:25:57 2009
New Revision: 740953
URL: http://svn.apache.org/viewvc?rev=740953&view=rev
Log:
NET-250: Make L8 check the last check
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=740953&r1=740952&r2=740953&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java Thu Feb 5 00:25:57 2009
@@ -97,8 +97,7 @@
{
ukey = key.toUpperCase(java.util.Locale.ENGLISH);
}
- if ((ukey.indexOf(FTPClientConfig.SYST_UNIX) >= 0)
- || (ukey.indexOf(FTPClientConfig.SYST_L8) >= 0))
+ if (ukey.indexOf(FTPClientConfig.SYST_UNIX) >= 0)
{
parser = createUnixFTPEntryParser();
}
@@ -127,6 +126,12 @@
{
parser = createNetwareFTPEntryParser();
}
+ else if (ukey.indexOf(FTPClientConfig.SYST_L8) >= 0)
+ {
+ // L8 normally means Unix, but move it to the end for some L8 systems that aren't.
+ // This check should be last!
+ parser = createUnixFTPEntryParser();
+ }
else
{
throw new ParserInitializationException("Unknown parser type: " + key);