This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7255a1a82e53d04e6fe4407c3d3c275d8f1a9c2e Author: Matthieu Baechler <[email protected]> AuthorDate: Wed Mar 25 12:05:41 2020 +0100 [Refactoring] avoid manual implementation of Math.min --- .../src/main/java/org/apache/james/mailbox/model/MessageRange.java | 6 +----- .../org/apache/james/sieverepository/file/SieveFileRepository.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java index 18b0eb3..f0d0835 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java @@ -249,11 +249,7 @@ public class MessageRange implements Iterable<MessageUid> { long to = getUidTo().asLong(); long realTo = to; while (from <= realTo) { - if (from + maxItems - 1 < realTo) { - to = from + maxItems - 1; - } else { - to = realTo; - } + to = Math.min(from + maxItems - 1, realTo); if (from == to) { ranges.add(MessageUid.of(from).toRange()); } else { diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index 7c67504..b774270 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -93,7 +93,7 @@ public class SieveFileRepository implements SieveRepository { protected static void toFile(File file, String content) throws StorageException { // Create a temporary file - int bufferSize = content.length() > MAX_BUFF_SIZE ? MAX_BUFF_SIZE : content.length(); + int bufferSize = Math.min(content.length(), MAX_BUFF_SIZE); File tmpFile = null; try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
