From 8ede9c7ba57c168be50f129a945f8589f34abd07 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 27 Feb 2025 15:29:47 +0100
Subject: [PATCH] Fix file uploader in observation form as well
---
.../logic/controller/servlet/MessageController.java | 1 -
.../controller/servlet/ObservationController.java | 13 ++++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
index 8aee00e7..550abd21 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
@@ -274,7 +274,6 @@ public class MessageController extends HttpServlet {
if(JakartaServletFileUpload.isMultipartContent(request))
{
// Create a new file upload handler
-
DiskFileItemFactory dfif = DiskFileItemFactory.builder().get();
JakartaServletFileUpload upload = new JakartaServletFileUpload(dfif);
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
index 91a147a5..bbffd5d1 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
@@ -18,7 +18,6 @@
package no.nibio.vips.logic.controller.servlet;
-import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -32,10 +31,13 @@ import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.stream.Collectors;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import jakarta.ejb.EJB;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
-import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
@@ -65,10 +67,6 @@ import no.nibio.web.forms.FormUtil;
import no.nibio.web.forms.FormValidation;
import no.nibio.web.forms.FormValidationException;
import no.nibio.web.forms.FormValidator;
-import org.apache.commons.fileupload2.core.FileItem;
-import org.apache.commons.fileupload2.core.FileUploadException;
-import org.apache.commons.fileupload2.core.DiskFileItemFactory;
-import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
/**
* @copyright 2014-2022 <a href="http://www.nibio.no/">NIBIO</a>
@@ -414,7 +412,8 @@ public class ObservationController extends HttpServlet {
{
// Create a new file upload handler
- JakartaServletFileUpload upload = new JakartaServletFileUpload();
+ DiskFileItemFactory dfif = DiskFileItemFactory.builder().get();
+ JakartaServletFileUpload upload = new JakartaServletFileUpload(dfif);
// Parse the request
items = upload.parseRequest(request);
--
GitLab