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 2008/04/06 22:29:37 UTC
svn commit: r645299 - in /commons/proper/net/branches/NET_2_0/src:
main/java/org/apache/commons/net/ftp/parser/
test/java/org/apache/commons/net/ftp/parser/
Author: rwinston
Date: Sun Apr 6 13:29:36 2008
New Revision: 645299
URL: http://svn.apache.org/viewvc?rev=645299&view=rev
Log:
Add Sebbs patch
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -102,7 +102,7 @@
}
catch (ParseException e)
{
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
if (null == name || name.equals(".") || name.equals(".."))
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -123,7 +123,7 @@
try {
f.setTimestamp(super.parseTimestamp(datestr));
} catch (ParseException e) {
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
//is it a DIR or a file
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -103,7 +103,7 @@
}
catch (ParseException e)
{
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -94,7 +94,7 @@
}
catch (ParseException e)
{
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -168,7 +168,7 @@
}
catch (ParseException e)
{
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java Sun Apr 6 13:29:36 2008
@@ -150,7 +150,7 @@
}
catch (ParseException e)
{
- return null; // this is a parsing failure too.
+ // intentionally do nothing
}
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java Sun Apr 6 13:29:36 2008
@@ -107,7 +107,7 @@
String test = badsamples[i][j];
FTPFile f = parser.parseFTPEntry(test);
assertNull("Should have Failed to parse " + test,
- f);
+ nullFileOrNullDate(f));
doAdditionalBadTests(test, f);
}
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java?rev=645299&r1=645298&r2=645299&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java Sun Apr 6 13:29:36 2008
@@ -54,7 +54,7 @@
String test = badsamples[i];
FTPFile f = parser.parseFTPEntry(test);
assertNull("Should have Failed to parse " + test,
- f);
+ nullFileOrNullDate(f));
doAdditionalBadTests(test, f);
}
@@ -145,5 +145,21 @@
super.setUp();
parser = getParser();
df = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy", Locale.US);
+ }
+
+ /**
+ * Check if FTPFile entry parsing failed; i.e. if entry is null or date is null.
+ *
+ * @param f FTPFile entry - may be null
+ * @return null if f is null or the date is null
+ */
+ protected FTPFile nullFileOrNullDate(FTPFile f) {
+ if (f==null){
+ return null;
+ }
+ if (f.getTimestamp() == null){
+ return null;
+ }
+ return f;
}
}