[commons-fileupload] branch master updated: Raise embedded if into parent if.

[ggregory]

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-fileupload.git


The following commit(s) were added to refs/heads/master by this push:
     new dd4a9ff  Raise embedded if into parent if.
dd4a9ff is described below

commit dd4a9ff37a87d9dfbc56f5049a8d6023da774007
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 12:32:25 2021 -0500

    Raise embedded if into parent if.
---
 .../commons/fileupload2/disk/DiskFileItem.java     |  8 +++-----
 .../fileupload2/impl/FileItemStreamImpl.java       | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java 
b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
index c0fc938..ba6d85d 100644
--- a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
@@ -402,11 +402,9 @@ public class DiskFileItem
                  * in a temporary location so move it to the
                  * desired file.
                  */
-                if (file.exists()) {
-                    if (!file.delete()) {
-                        throw new FileUploadException(
-                                "Cannot write uploaded file to disk!");
-                    }
+                if (file.exists() && !file.delete()) {
+                    throw new FileUploadException(
+                            "Cannot write uploaded file to disk!");
                 }
                 FileUtils.moveFile(outputFile, file);
             } else {
diff --git 
a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java 
b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
index bbf5064..ded94b8 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
@@ -94,18 +94,16 @@ public class FileItemStreamImpl implements FileItemStream {
         contentType = pContentType;
         formField = pFormField;
         final long fileSizeMax = fileItemIteratorImpl.getFileSizeMax();
-        if (fileSizeMax != -1) { // Check if limit is already exceeded
-            if (pContentLength != -1
-                    && pContentLength > fileSizeMax) {
-                final FileSizeLimitExceededException e =
-                        new FileSizeLimitExceededException(
-                                format("The field %s exceeds its maximum 
permitted size of %s bytes.",
-                                        fieldName, Long.valueOf(fileSizeMax)),
-                                pContentLength, fileSizeMax);
-                e.setFileName(pName);
-                e.setFieldName(pFieldName);
-                throw new FileUploadIOException(e);
-            }
+        if (fileSizeMax != -1 && pContentLength != -1
+                && pContentLength > fileSizeMax) {
+            final FileSizeLimitExceededException e =
+                    new FileSizeLimitExceededException(
+                            format("The field %s exceeds its maximum permitted 
size of %s bytes.",
+                                    fieldName, Long.valueOf(fileSizeMax)),
+                            pContentLength, fileSizeMax);
+            e.setFileName(pName);
+            e.setFieldName(pFieldName);
+            throw new FileUploadIOException(e);
         }
         // OK to construct stream now
         final ItemInputStream itemStream = 
fileItemIteratorImpl.getMultiPartStream().newInputStream();