From e152c15f78d2052737f0ed3d95fd8f54979a4557 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 22 Nov 2016 17:44:02 +0100 Subject: [PATCH] Adds WARN to avoid using java.io.File --- .../apache/struts2/conversion/UploadedFileConverter.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java b/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java index 15b0d8568..8ceac3101 100644 --- a/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java @@ -20,6 +20,8 @@ package org.apache.struts2.conversion; import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.multipart.UploadedFile; import java.io.File; @@ -29,9 +31,14 @@ import java.util.Map; public class UploadedFileConverter extends DefaultTypeConverter { + private static final Logger LOG = LogManager.getLogger(UploadedFileConverter.class); + @Override public Object convertValue(Map context, Object target, Member member, String propertyName, Object value, Class toType) { if (File.class.equals(toType)) { + LOG.warn("Converting {} into {}, consider switching to {} and do not access {} directly!", + File.class.getName(), UploadedFile.class.getName(), UploadedFile.class.getName(), File.class.getName()); + if (value.getClass().isArray() && Array.getLength(value) == 1) { Object obj = Array.get(value, 0); if (obj instanceof UploadedFile) {