From 83c702085a885e31dacfca15af6bc1a4488c6151 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 18 Mar 2022 13:34:59 +0100
Subject: [PATCH] Avoiding strange mutation of observation object when deleting
images
---
.../no/nibio/vips/logic/controller/session/ObservationBean.java | 1 -
.../java/no/nibio/vips/logic/service/ObservationService.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
index ddcc2fe2..bcc841a8 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
@@ -501,7 +501,6 @@ public class ObservationBean {
File fileToDelete = new File(this.getFilePath(observation) + "/" + ill.getObservationIllustrationPK().getFileName());
fileToDelete.delete();
}
-
return observation;
}
diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationService.java b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
index aea53b42..10ef8473 100755
--- a/src/main/java/no/nibio/vips/logic/service/ObservationService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
@@ -799,7 +799,7 @@ public class ObservationService {
if(illusMap.get("deleted") != null && ((Boolean) illusMap.get("deleted")) == true)
{
- mergeObs = observationBean.deleteObservationIllustration(mergeObs, new String[] {pk.getFileName()});
+ observationBean.deleteObservationIllustration(mergeObs, new String[] {pk.getFileName()});
}
else if(illusMap.get("uploaded") != null && ((Boolean) illusMap.get("uploaded")) == false && illusMap.get("imageTextData") != null)
{
--
GitLab