This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.x in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 4b63bb237bb51af18c258bbc008b6eb8d00a53da Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Sep 15 15:58:38 2023 +0100 Fix SpotBugs warnings --- src/main/java/org/apache/commons/fileupload/ParameterParser.java | 2 +- .../java/org/apache/commons/fileupload/disk/DiskFileItem.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/fileupload/ParameterParser.java b/src/main/java/org/apache/commons/fileupload/ParameterParser.java index 52ff59cc..9a484cc2 100644 --- a/src/main/java/org/apache/commons/fileupload/ParameterParser.java +++ b/src/main/java/org/apache/commons/fileupload/ParameterParser.java @@ -299,7 +299,7 @@ public class ParameterParser { return new HashMap<String, String>(); } final HashMap<String, String> params = new HashMap<String, String>(); - this.chars = charArray; + this.chars = charArray.clone(); this.pos = offset; this.len = length; diff --git a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java index 64ea0246..98d78773 100644 --- a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java +++ b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java @@ -303,7 +303,7 @@ public class DiskFileItem if (cachedContent == null && dfos != null) { cachedContent = dfos.getData(); } - return cachedContent; + return cachedContent != null ? cachedContent.clone() : new byte[0]; } byte[] fileData = new byte[(int) getSize()]; @@ -350,15 +350,15 @@ public class DiskFileItem */ @Override public String getString() { - final byte[] rawdata = get(); + final byte[] rawData = get(); String charset = getCharSet(); if (charset == null) { charset = defaultCharset; } try { - return new String(rawdata, charset); + return new String(rawData, charset); } catch (final UnsupportedEncodingException e) { - return new String(rawdata); + return ""; } }