From aa7e925903d6cd780bde82d5cd3fd8b2fe9d8276 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 16 Feb 2015 12:05:47 +0100
Subject: [PATCH] OO-1437: catch IllegalArgumentException too
---
src/main/java/de/bps/onyx/plugin/OnyxModule.java | 2 +-
src/main/java/org/olat/core/util/PathUtils.java | 2 +-
src/main/java/org/olat/fileresource/types/FeedFileResource.java | 2 +-
src/main/java/org/olat/fileresource/types/GlossaryResource.java | 2 +-
.../java/org/olat/fileresource/types/ImsCPFileResource.java | 2 +-
.../java/org/olat/fileresource/types/ScormCPFileResource.java | 2 +-
src/main/java/org/olat/fileresource/types/WikiResource.java | 2 +-
.../java/org/olat/ims/qti/fileresource/SurveyFileResource.java | 2 +-
.../java/org/olat/ims/qti/fileresource/TestFileResource.java | 2 +-
src/main/java/org/olat/repository/handlers/CourseHandler.java | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/bps/onyx/plugin/OnyxModule.java b/src/main/java/de/bps/onyx/plugin/OnyxModule.java
index 5d139dd1384..05274a14e2a 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 c49169774e3..b54ec381945 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 74234de258d..643cd05b76d 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 4af7d53aae9..fe70b0ca2e2 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 80a2c3749f7..27910be2689 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 35cb66842fb..a025776a8a1 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 645c50bd120..0ff7c3f9889 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 143bf5098da..95aa95cc3c8 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 f4ab27f13fd..bc775b75fb6 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 1f2f0305ff4..8623330192d 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;
--
GitLab