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 2020/09/20 19:05:00 UTC
[commons-net] 04/09: Merge identical blocks.
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 9148126fa2d829637d1977901c6417256b20c582
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Sep 20 14:58:45 2020 -0400
Merge identical blocks.
---
src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java | 5 +----
src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java | 4 +---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index ee985c2..e48897a 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -133,10 +133,7 @@ public class MLSxEntryParser extends FTPFileEntryParserImpl
continue; // nothing to see here
}
String valueLowerCase = factvalue.toLowerCase(Locale.ENGLISH);
- if ("size".equals(factname)) {
- file.setSize(Long.parseLong(factvalue));
- }
- else if ("sizd".equals(factname)) { // Directory size
+ if ("size".equals(factname) || "sizd".equals(factname)) {
file.setSize(Long.parseLong(factvalue));
}
else if ("modify".equals(factname)) {
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
index abb6c25..464b4ac 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
@@ -49,9 +49,7 @@ public class TFTPServerMain {
String arg = args[argc];
if (arg.startsWith("-"))
{
- if (arg.equals("-v")) {
- opts.put(arg, arg);
- } else if (arg.equals("-r")) {
+ if (arg.equals("-v") || arg.equals("-r")) {
opts.put(arg, arg);
} else if (arg.equals("-p")) {
opts.put(arg, args[++argc]);