commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1800686 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Date Mon, 03 Jul 2017 15:38:05 GMT
Author: sebb
Date: Mon Jul  3 15:38:05 2017
New Revision: 1800686

URL: http://svn.apache.org/viewvc?rev=1800686&view=rev
Log:
NET-639 - MVSFTPEntryParser.preParse - MVS, z/OS - allow for merged Ext/Used fields

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1800686&r1=1800685&r2=1800686&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Mon Jul  3 15:38:05 2017
@@ -74,6 +74,9 @@ This is mainly a bug-fix release. See fu
  The examples are not part of the public API, so this does not affect compatibility.
 
 ">
+            <action issue="NET-639" type="fix" dev="sebb" due-to=" Alexander Eller">
+            MVSFTPEntryParser.preParse - MVS, z/OS - allow for merged Ext/Used fields
+            </action>
             <action issue="NET-636" type="fix" dev="sebb">
             examples should be in org.apache.commons.net subpackage
             </action>

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=1800686&r1=1800685&r2=1800686&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
Mon Jul  3 15:38:05 2017
@@ -66,7 +66,8 @@ public class MVSFTPEntryParser extends C
             "\\S+\\s+" + // unit - ignored
             "\\S+\\s+" + // access date - ignored
             "\\S+\\s+" + // extents -ignored
-            "\\S+\\s+" + // used - ignored
+            // If the values are too large, the fields may be merged (NET-639)
+            "(?:\\S+\\s+)?" + // used - ignored
             "[FV]\\S*\\s+" + // recfm - must start with F or V
             "\\S+\\s+" + // logical record length -ignored
             "\\S+\\s+" + // block size - ignored

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java?rev=1800686&r1=1800685&r2=1800686&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
(original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Mon Jul  3 15:38:05 2017
@@ -42,7 +42,9 @@ public class MVSFTPEntryParserTest exten
             "PSMLC6 3390   2005/04/05  1    1  VB   27994 27998  PS    file7.O.BU",
             "FPFS49 3390   2004/06/23  1    1  FB     128  6144  PO-E  INCOMING.RPTBM026.D061704",
             "FPFS41 3390   2004/06/23  1    1  FB     128  6144  PS    INCOMING.RPTBM056.D061704",
-            "FPFS25 3390   2004/06/23  1    1  FB     128  6144  PS    INCOMING.WTM204.D061704",
};
+            "FPFS25 3390   2004/06/23  1    1  FB     128  6144  PS    INCOMING.WTM204.D061704",
+            "PEX26F 3390   2017/07/03  115807  FB   29600 29600  PS    INCOMING.FIN.D170630.T160630",
+        };
 
     private static final String[] goodsamplesMemberList = {
             /* Note, if the string begins with SAVE, the parsed entry is stored in the List
saveftpfiles */



Mime
View raw message