Skip to content
Snippets Groups Projects
Commit 83c70208 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Avoiding strange mutation of observation object when deleting images

parent 9c01fec8
No related branches found
No related tags found
No related merge requests found
...@@ -501,7 +501,6 @@ public class ObservationBean { ...@@ -501,7 +501,6 @@ public class ObservationBean {
File fileToDelete = new File(this.getFilePath(observation) + "/" + ill.getObservationIllustrationPK().getFileName()); File fileToDelete = new File(this.getFilePath(observation) + "/" + ill.getObservationIllustrationPK().getFileName());
fileToDelete.delete(); fileToDelete.delete();
} }
return observation; return observation;
} }
......
...@@ -799,7 +799,7 @@ public class ObservationService { ...@@ -799,7 +799,7 @@ public class ObservationService {
if(illusMap.get("deleted") != null && ((Boolean) illusMap.get("deleted")) == true) 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) else if(illusMap.get("uploaded") != null && ((Boolean) illusMap.get("uploaded")) == false && illusMap.get("imageTextData") != null)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment