You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/02/20 01:01:15 UTC
(commons-net) 05/08: Reuse IOUtils
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 77c278687651a80dace5b5851c70341d7d860935
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Feb 19 19:50:14 2025 -0500
Reuse IOUtils
---
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 69411572..1aa343c4 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -18,7 +18,6 @@ package org.apache.commons.net.ftp;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -42,6 +41,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Random;
@@ -2396,16 +2396,13 @@ public class FTPClient extends FTP implements Configurable {
* @throws IOException If an I/O error occurs while either sending a command to the server or receiving a reply from the server.
*/
public String[] listNames(final String path) throws IOException {
- final ArrayList<String> results = new ArrayList<>();
+ final List<String> results;
try (Socket socket = _openDataConnection_(FTPCmd.NLST, getListArguments(path))) {
if (socket == null) {
return null;
}
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), getControlEncoding()))) {
- String line;
- while ((line = reader.readLine()) != null) {
- results.add(line);
- }
+ try (InputStream in = socket.getInputStream()) {
+ results = IOUtils.readLines(in, getControlEncoding());
}
}
if (completePendingCommand()) {