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 2022/04/30 19:14:40 UTC
[commons-net] branch master updated: Use Math.min and Math.max method instead of manual calculations.
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
The following commit(s) were added to refs/heads/master by this push:
new ca114bc5 Use Math.min and Math.max method instead of manual calculations.
new f99b6fd6 Merge pull request #104 from arturobernalg/feature/min_max
ca114bc5 is described below
commit ca114bc5126da299b845641d287c141bab0df1a3
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Apr 15 18:27:28 2022 +0200
Use Math.min and Math.max method instead of manual calculations.
---
.../org/apache/commons/net/io/FromNetASCIIInputStream.java | 2 +-
src/main/java/org/apache/commons/net/tftp/TFTPClient.java | 6 +-----
.../java/org/apache/commons/net/tftp/TFTPDataPacket.java | 12 ++----------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
index 38a91aed..bcf92206 100644
--- a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
@@ -164,7 +164,7 @@ public final class FromNetASCIIInputStream extends PushbackInputStream
ch = available();
- this.length = length > ch ? ch : length;
+ this.length = Math.min(length, ch);
// If nothing is available, block to read only one character
if (this.length < 1) {
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
index f029c8ab..b3330a38 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
@@ -528,10 +528,6 @@ public class TFTPClient extends TFTP
*/
public void setMaxTimeouts(final int numTimeouts)
{
- if (numTimeouts < 1) {
- maxTimeouts = 1;
- } else {
- maxTimeouts = numTimeouts;
- }
+ maxTimeouts = Math.max(numTimeouts, 1);
}
}
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
index 85fb970d..9abc1e47 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
@@ -121,11 +121,7 @@ public final class TFTPDataPacket extends TFTPPacket
this.data = data;
this.offset = offset;
- if (length > MAX_DATA_LENGTH) {
- this.length = MAX_DATA_LENGTH;
- } else {
- this.length = length;
- }
+ this.length = Math.min(length, MAX_DATA_LENGTH);
}
/**
@@ -251,11 +247,7 @@ public final class TFTPDataPacket extends TFTPPacket
this.offset = offset;
this.length = length;
- if (length > MAX_DATA_LENGTH) {
- this.length = MAX_DATA_LENGTH;
- } else {
- this.length = length;
- }
+ this.length = Math.min(length, MAX_DATA_LENGTH);
}
/**