svn commit: r1083365 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java

[sebb]

Author: sebb
Date: Sun Mar 20 04:17:32 2011
New Revision: 1083365

URL: http://svn.apache.org/viewvc?rev=1083365&view=rev
Log:
Fix bug; tidy indentation

Modified:
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java?rev=1083365&r1=1083364&r2=1083365&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
 Sun Mar 20 04:17:32 2011
@@ -114,6 +114,7 @@ public class MLSxEntryParser extends FTP
             }
             String factname = factparts[0].toLowerCase(Locale.ENGLISH);
             String factvalue = factparts[1];
+            String valueLowerCase = factvalue.toLowerCase(Locale.ENGLISH);
             if ("size".equals(factname)) {
                 file.setSize(Long.parseLong(factvalue));
             }
@@ -138,7 +139,12 @@ public class MLSxEntryParser extends FTP
                 file.setTimestamp(gc);
             }
             else if ("type".equals(factname)) {
-                
file.setType(TYPE_TO_INT.get(factvalue.toLowerCase(Locale.ENGLISH)).intValue());
+                    Integer intType = TYPE_TO_INT.get(valueLowerCase);
+                    if (intType == null) {
+                        // TODO System.out.println(factvalue+ "? in "+entry);
+                    } else {
+                        file.setType(intType.intValue());
+                    }
             }
             else if (factname.startsWith("unix.")) {
                 String unixfact = 
factname.substring("unix.".length()).toLowerCase(Locale.ENGLISH);
@@ -155,13 +161,13 @@ public class MLSxEntryParser extends FTP
                         }
                     }
                     file.setUser(factvalue);
-                }
-            }
+                } // mode
+            } // unix.
             else if (!hasUnixMode && "perm".equals(factname)) { // skip if we 
have the UNIX.mode
                 //              perm-fact    = "Perm" "=" *pvals
                 //              pvals        = "a" / "c" / "d" / "e" / "f" /
                 //                             "l" / "m" / "p" / "r" / "w"
-                for(char c : 
factvalue.toLowerCase(Locale.ENGLISH).toCharArray()) {
+                for(char c : valueLowerCase.toCharArray()) {
                     // TODO these are mostly just guesses at present
                     switch (c) {
                         case 'a':     // (file) may APPEnd
@@ -198,7 +204,6 @@ public class MLSxEntryParser extends FTP
                             return null; // TODO?
                     }
                 }
-                
file.setType(TYPE_TO_INT.get(factvalue.toLowerCase(Locale.ENGLISH)).intValue());
             }
         }
         return file;