Merge OpenOLAT 9.4 to OpenOLAT 10.0 with 1f679536d92efc72852f3a1ac71bf14a4dce5210

src/main/java/org/olat/repository/handlers/WikiHandler.java

@@ -307,16 +307,13 @@ public class WikiHandler implements RepositoryHandler {
 		String fullFilePath = archivFilePath + File.separator + exportFileName;
 		
 		File fExportZIP = new File(fullFilePath);
-		InputStream fis = wikiZip.getInputStream();
-		
-		try {
-			FileUtils.bcopy(wikiZip.getInputStream(), fExportZIP, "archive wiki");
+
+		try (InputStream fis = wikiZip.getInputStream()) {
+			FileUtils.bcopy(fis, fExportZIP, "archive wiki");
 		} catch (FileNotFoundException e) {
 			log.warn("Can not archive wiki repoEntry=" + repoEntry);
 		} catch (IOException ioe) {
 			log.warn("Can not archive wiki repoEntry=" + repoEntry);
-		} finally {
-			FileUtils.closeSafely(fis);
 		}
 		return exportFileName;
 	}