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 2023/04/05 23:47:00 UTC
[commons-fileupload] 06/06: Use &&
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
commit a720d1bf5a11f6ba58370c7409e91a0c6ba45d84
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 5 19:44:18 2023 -0400
Use &&
---
.../apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java | 8 ++------
.../org/apache/commons/fileupload2/servlet/ServletFileUpload.java | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
index 2294ea8..47f922c 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
@@ -61,12 +61,8 @@ public class JakSrvltFileUpload extends FileUpload {
* @return {@code true} if the request is multipart;
* {@code false} otherwise.
*/
- public static final boolean isMultipartContent(
- final HttpServletRequest request) {
- if (!POST_METHOD.equalsIgnoreCase(request.getMethod())) {
- return false;
- }
- return AbstractFileUpload.isMultipartContent(new JakSrvltRequestContext(request));
+ public static final boolean isMultipartContent(final HttpServletRequest request) {
+ return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new JakSrvltRequestContext(request));
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java b/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
index 2a29dbc..4c9d394 100644
--- a/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
@@ -61,12 +61,8 @@ public class ServletFileUpload extends FileUpload {
* @return {@code true} if the request is multipart;
* {@code false} otherwise.
*/
- public static final boolean isMultipartContent(
- final HttpServletRequest request) {
- if (!POST_METHOD.equalsIgnoreCase(request.getMethod())) {
- return false;
- }
- return AbstractFileUpload.isMultipartContent(new ServletRequestContext(request));
+ public static final boolean isMultipartContent(final HttpServletRequest request) {
+ return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new ServletRequestContext(request));
}
/**