Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 70503 invoked from network); 18 Mar 2011 20:54:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Mar 2011 20:54:09 -0000 Received: (qmail 63664 invoked by uid 500); 18 Mar 2011 20:54:08 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 63615 invoked by uid 500); 18 Mar 2011 20:54:08 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 63608 invoked by uid 99); 18 Mar 2011 20:54:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2011 20:54:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2011 20:54:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BFBF32388AF0; Fri, 18 Mar 2011 20:53:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1083065 - in /commons/proper/net/trunk/src/main/java/org/apache/commons/net: ftp/FTP.java io/DotTerminatedMessageReader.java Date: Fri, 18 Mar 2011 20:53:45 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110318205345.BFBF32388AF0@eris.apache.org> Author: sebb Date: Fri Mar 18 20:53:45 2011 New Revision: 1083065 URL: http://svn.apache.org/viewvc?rev=1083065&view=rev Log: Trailing spaces Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=1083065&r1=1083064&r2=1083065&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java Fri Mar 18 20:53:45 2011 @@ -1446,7 +1446,7 @@ public class FTP extends SocketClient * level of access, use {@link org.apache.commons.net.ftp.FTPClient} * , which will handle all low level details for you. *

- * @param pathname The pathname to list, + * @param pathname The pathname to list, * may be {@code null} in which case the command is sent with no parameters * @return The reply code received from the server. * @exception FTPConnectionClosedException Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java?rev=1083065&r1=1083064&r2=1083065&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java Fri Mar 18 20:53:45 2011 @@ -97,7 +97,7 @@ public final class DotTerminatedMessageR if (chint == DOT) { // Have DOT DOT // no need to reset as we want to lose the first DOT return chint; // i.e. DOT - } + } if (chint == CR) { // Have DOT CR chint = super.read(); if (chint == -1) { // Still only DOT CR - should not happen @@ -222,7 +222,7 @@ public final class DotTerminatedMessageR } /** - * Read a line of text. + * Read a line of text. * A line is considered to be terminated by carriage return followed immediately by a linefeed. * This contrasts with BufferedReader which also allows other combinations. * @since 3.0 @@ -232,7 +232,7 @@ public final class DotTerminatedMessageR StringBuilder sb = new StringBuilder(); int intch; synchronized(lock) { // make thread-safe (hopefully!) - while((intch = read()) != -1) + while((intch = read()) != -1) { if (intch == LF && atBeginning) { return sb.substring(0, sb.length()-1);