Author: sebb Date: Fri Dec 5 18:13:18 2014 New Revision: 1643374 URL: http://svn.apache.org/r1643374 Log: NET-561 FTPFile.toFormattedString prints user and group in wrong order
Modified: commons/proper/net/trunk/src/changes/changes.xml commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.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=1643374&r1=1643373&r2=1643374&view=diff ============================================================================== --- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original) +++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Fri Dec 5 18:13:18 2014 @@ -68,6 +68,9 @@ This is mainly a bug-fix release. See fu IMAPExportMbox (example app) allows IMAP folders to be exported into an mbox file. This is the inverse of the IMAPImportMbox example added previously "> + <action issue="NET-561" type="fix" dev="sebb"> + FTPFile.toFormattedString prints user and group in wrong order + </action> <action issue="NET-544" type="fix" dev="sebb" due-to="Olivier Queyrut "> FTPClient.initiateListParsing does not correctly check if parserKey was cached </action> Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java?rev=1643374&r1=1643373&r2=1643374&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java Fri Dec 5 18:13:18 2014 @@ -395,7 +395,7 @@ public class FTPFile implements Serializ sb.append(permissionToString(GROUP_ACCESS)); sb.append(permissionToString(WORLD_ACCESS)); fmt.format(" %4d", Integer.valueOf(getHardLinkCount())); - fmt.format(" %-8s %-8s", getGroup(), getUser()); + fmt.format(" %-8s %-8s", getUser(), getGroup()); fmt.format(" %8d", Long.valueOf(getSize())); Calendar timestamp = getTimestamp(); if (timestamp != null) {