diff --git a/src/main/java/de/bps/onyx/plugin/OnyxModule.java b/src/main/java/de/bps/onyx/plugin/OnyxModule.java index 5d139dd13842933f796d39d8ddbbe89659993bd1..05274a14e2ab535976d5aea99a340953e713ddf9 100644 --- a/src/main/java/de/bps/onyx/plugin/OnyxModule.java +++ b/src/main/java/de/bps/onyx/plugin/OnyxModule.java @@ -236,7 +236,7 @@ public class OnyxModule extends AbstractOLATModule implements ConfigOnOff { } } catch(NoSuchFileException nsfe) { eval.setValid(false); - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); eval.setValid(false); } finally { diff --git a/src/main/java/org/olat/core/util/PathUtils.java b/src/main/java/org/olat/core/util/PathUtils.java index c49169774e39594770724a615e383e89e87555ba..b54ec3819456929481eb723073856d14b6bc41ca 100644 --- a/src/main/java/org/olat/core/util/PathUtils.java +++ b/src/main/java/org/olat/core/util/PathUtils.java @@ -41,7 +41,7 @@ import java.nio.file.attribute.BasicFileAttributes; public class PathUtils { public static Path visit(File file, String filename, FileVisitor<Path> visitor) - throws IOException { + throws IOException, IllegalArgumentException { if(!StringHelper.containsNonWhitespace(filename)) { filename = file.getName(); } diff --git a/src/main/java/org/olat/fileresource/types/FeedFileResource.java b/src/main/java/org/olat/fileresource/types/FeedFileResource.java index 74234de258d50e34b3c5dad164504a331230098c..643cd05b76d502153ea91e4704b998f13c2eec9c 100644 --- a/src/main/java/org/olat/fileresource/types/FeedFileResource.java +++ b/src/main/java/org/olat/fileresource/types/FeedFileResource.java @@ -96,7 +96,7 @@ public abstract class FeedFileResource extends FileResource { eval.setDescription(feed.getDescription()); } } - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); } return eval; diff --git a/src/main/java/org/olat/fileresource/types/GlossaryResource.java b/src/main/java/org/olat/fileresource/types/GlossaryResource.java index 4af7d53aae976da5e18e7bd1c18b08a4fd1401c7..fe70b0ca2e2c6eb71c1ff4981650aa9dab9ea8ad 100644 --- a/src/main/java/org/olat/fileresource/types/GlossaryResource.java +++ b/src/main/java/org/olat/fileresource/types/GlossaryResource.java @@ -94,7 +94,7 @@ public class GlossaryResource extends FileResource { eval.setValid(true); } eval.setValid(visitor.isValid()); - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); } return eval; diff --git a/src/main/java/org/olat/fileresource/types/ImsCPFileResource.java b/src/main/java/org/olat/fileresource/types/ImsCPFileResource.java index 80a2c3749f790b4f69ab4d161be651647f06c1a7..27910be268992052cf2fdf73b3b9add59f9436fe 100644 --- a/src/main/java/org/olat/fileresource/types/ImsCPFileResource.java +++ b/src/main/java/org/olat/fileresource/types/ImsCPFileResource.java @@ -79,7 +79,7 @@ public class ImsCPFileResource extends FileResource { } else { eval.setValid(false); } - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); eval.setValid(false); } diff --git a/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java b/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java index 35cb66842fb4858800218aed36bd6f6bc1c22d3f..a025776a8a12ef6687387d2a8fc4892c14cd1f88 100644 --- a/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java +++ b/src/main/java/org/olat/fileresource/types/ScormCPFileResource.java @@ -94,7 +94,7 @@ public class ScormCPFileResource extends FileResource { } else { eval.setValid(false); } - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); eval.setValid(false); } diff --git a/src/main/java/org/olat/fileresource/types/WikiResource.java b/src/main/java/org/olat/fileresource/types/WikiResource.java index 645c50bd120d1fbe1725607872156688ac4530f8..0ff7c3f98894707d8e500a001fd433e72e76d8fc 100644 --- a/src/main/java/org/olat/fileresource/types/WikiResource.java +++ b/src/main/java/org/olat/fileresource/types/WikiResource.java @@ -63,7 +63,7 @@ public class WikiResource extends FileResource { IndexFileFilter visitor = new IndexFileFilter(); PathUtils.visit(file, filename, visitor); eval.setValid(visitor.isValid()); - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); } return eval; diff --git a/src/main/java/org/olat/ims/qti/fileresource/SurveyFileResource.java b/src/main/java/org/olat/ims/qti/fileresource/SurveyFileResource.java index 143bf5098da6f2689f917c40d81627b33fdb1268..95aa95cc3c8ab1fed7fe47446f52453757387b5a 100644 --- a/src/main/java/org/olat/ims/qti/fileresource/SurveyFileResource.java +++ b/src/main/java/org/olat/ims/qti/fileresource/SurveyFileResource.java @@ -100,7 +100,7 @@ public class SurveyFileResource extends FileResource { } else { eval.setValid(false); } - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); eval.setValid(false); } diff --git a/src/main/java/org/olat/ims/qti/fileresource/TestFileResource.java b/src/main/java/org/olat/ims/qti/fileresource/TestFileResource.java index f4ab27f13fd500fab8a5ff806d0071486ec6c1ce..bc775b75fb6e50ffc2cf265c2c08b8e6f4aea4b4 100644 --- a/src/main/java/org/olat/ims/qti/fileresource/TestFileResource.java +++ b/src/main/java/org/olat/ims/qti/fileresource/TestFileResource.java @@ -100,7 +100,7 @@ public class TestFileResource extends FileResource { } else { eval.setValid(false); } - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); eval.setValid(false); } diff --git a/src/main/java/org/olat/repository/handlers/CourseHandler.java b/src/main/java/org/olat/repository/handlers/CourseHandler.java index 1f2f0305ff44d89ab240f3555dc6ba8d7b1f4fb9..8623330192dec38f0f68c3084a9fc8fd360e9c52 100644 --- a/src/main/java/org/olat/repository/handlers/CourseHandler.java +++ b/src/main/java/org/olat/repository/handlers/CourseHandler.java @@ -193,7 +193,7 @@ public class CourseHandler implements RepositoryHandler { } } eval.setValid(visitor.isValid()); - } catch (IOException e) { + } catch (IOException | IllegalArgumentException e) { log.error("", e); } return eval;