dfs 2004/07/27 22:01:47
Modified: net/src/java/org/apache/commons/net/ftp/parser
EnterpriseUnixFTPEntryParser.java
NTFTPEntryParser.java OS2FTPEntryParser.java
OS400FTPEntryParser.java UnixFTPEntryParser.java
VMSFTPEntryParser.java
net/xdocs changes.xml
Log:
Fixed regression from migration to new parsers. Most of the
new parsers parsed the file size as an integer instead of a
long. Changed all of them to set the size to long. This
problem was detected by the reporter of:
http://issues.apache.org/bugzilla/show_bug.cgi?id=30345
Affected files:
EnterpriseUnixFTPEntryParser.java
NTFTPEntryParser.java
OS2FTPEntryParser.java
OS400FTPEntryParser.java
UnixFTPEntryParser.java
VMSFTPEntryParser.java
PR: 30345
Submitted by: [EMAIL PROTECTED] (Kurt Kessel)
Revision Changes Path
1.12 +2 -2
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
Index: EnterpriseUnixFTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EnterpriseUnixFTPEntryParser.java 21 Apr 2004 23:30:33 -0000 1.11
+++ EnterpriseUnixFTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.12
@@ -101,7 +101,7 @@
file.setGroup(grp);
try
{
- file.setSize(Integer.parseInt(filesize));
+ file.setSize(Long.parseLong(filesize));
}
catch (NumberFormatException e)
{
1.17 +2 -2
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
Index: NTFTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NTFTPEntryParser.java 4 May 2004 22:44:05 -0000 1.16
+++ NTFTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.17
@@ -142,7 +142,7 @@
f.setType(FTPFile.FILE_TYPE);
if (null != size)
{
- f.setSize(new Integer(size).intValue());
+ f.setSize(Long.parseLong(size));
}
}
return (f);
1.12 +2 -4
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
Index: OS2FTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OS2FTPEntryParser.java 21 Apr 2004 23:30:33 -0000 1.11
+++ OS2FTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.12
@@ -123,9 +123,7 @@
f.setName(name.trim());
//set the size
- Long theSize = new Long(size.trim());
- theSize = new Long(String.valueOf(theSize.intValue()));
- f.setSize(theSize.longValue());
+ f.setSize(Long.parseLong(size.trim()));
return (f);
}
1.4 +2 -2
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
Index: OS400FTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OS400FTPEntryParser.java 22 Apr 2004 00:48:07 -0000 1.3
+++ OS400FTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.4
@@ -77,7 +77,7 @@
try
{
- file.setSize(Integer.parseInt(filesize));
+ file.setSize(Long.parseLong(filesize));
}
catch (NumberFormatException e)
{
1.18 +2 -2
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
Index: UnixFTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- UnixFTPEntryParser.java 22 Jun 2004 02:30:33 -0000 1.17
+++ UnixFTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.18
@@ -175,7 +175,7 @@
try
{
- file.setSize(Integer.parseInt(filesize));
+ file.setSize(Long.parseLong(filesize));
}
catch (NumberFormatException e)
{
1.24 +2 -3
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
Index: VMSFTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- VMSFTPEntryParser.java 22 Apr 2004 00:48:07 -0000 1.23
+++ VMSFTPEntryParser.java 28 Jul 2004 05:01:47 -0000 1.24
@@ -173,8 +173,7 @@
}
//size is retreived in blocks and needs to be put in bytes
//for us humans and added to the FTPFile array
- Long theSize = new Long(size);
- long sizeInBytes = theSize.longValue() * longBlock;
+ long sizeInBytes = Long.parseLong(size) * longBlock;
f.setSize(sizeInBytes);
//set the date
1.30 +10 -0 jakarta-commons/net/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/net/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 26 Jun 2004 02:24:47 -0000 1.29
+++ changes.xml 28 Jul 2004 05:01:47 -0000 1.30
@@ -21,6 +21,16 @@
</properties>
<body>
+ <release version="1.3.0-dev" date="July 28, 2004"
+ description="regression fix">
+ <action dev="dfs" type="fix">
+ Fixed regression from migration to new parsers. Most of the
+ new parsers parsed the file size as an integer instead of a
+ long. Changed all of them to set the size to long. This
+ problem was detected by the reporter of:
+ http://issues.apache.org/bugzilla/show_bug.cgi?id=30345
+ </action>
+ </release>
<release version="1.2.2" date="June 25, 2004" description="fix release">
<action dev="scohen" type="fix">
fixed bug in the way FTPClient.listFiles worked when a directory was
not
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
