non-jira: backport OLATpro method to OpenOLAT : eportfolio : delete tmp-dir...

non-jira:  backport OLATpro method to OpenOLAT : eportfolio : delete tmp-dir after artefact-creation workflow completes (ondispose)

--HG--
branch : 80-patch

src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java

@@ -150,16 +150,18 @@ public class EPAddArtefactController extends BasicController {
 	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
 		if (source == collectStepsCtrl && event == Event.CANCELLED_EVENT) {
-			if(vfsTemp != null) {
-				vfsTemp.delete();
-				vfsTemp = null;
-			}
+			disposeTempDir();
 			getWindowControl().pop();
 			removeAsListenerAndDispose(collectStepsCtrl);
 		}
 		if (source == collectStepsCtrl && event == Event.CHANGED_EVENT) {
 			getWindowControl().pop();
 			removeAsListenerAndDispose(collectStepsCtrl);
+			
+			// manually dispose temp vfsContainer here :: FXOLAT-386 
+			// this EPAddArtefactController gets disposed "too late" 
+			//(vfsTemp can change inbetween, so only the last one get's deleted)
+			disposeTempDir();
 			showInfo("collect.success.text.artefact");
 			fireEvent(ureq, Event.DONE_EVENT);
 		} 
@@ -230,14 +232,23 @@ public class EPAddArtefactController extends BasicController {
 		getWindowControl().pushAsModalDialog(collectStepsCtrl.getInitialComponent());
 	}
 
+	/**
+	 * FXOLAT-386
+	 * disposed the temp vfsContainer from a file Artefact upload
+	 */
+	private void disposeTempDir(){
+		if(vfsTemp != null ) {
+			vfsTemp.delete();
+			vfsTemp = null;
+		}
+	}
+	
 	/**
 	 * @see org.olat.core.gui.control.DefaultController#doDispose()
 	 */
 	@Override
 	protected void doDispose() {
-		if (vfsTemp != null) {
-			vfsTemp.delete();
-		}
+		disposeTempDir();
 	}
 
 }