From 5100b21c308c20e862b79a94b4b577f8c6a13e09 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 11 Sep 2014 11:59:11 +0200
Subject: [PATCH] OO-1190: better error handling
---
.../ims/qti/qpool/QTIImportProcessor.java | 20 ++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java b/src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java
index ecdd8967f01..ee51300cc47 100644
--- a/src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java
+++ b/src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java
@@ -30,6 +30,7 @@ import java.io.StringReader;
import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
@@ -544,14 +545,19 @@ class QTIImportProcessor {
private boolean processSidecarMetadata(QuestionItemImpl item, DocInfos docInfos) {
try {
Path path = docInfos.root;
- Path metadata = path.resolve(path.getFileName().toString() + "_metadata.xml");
- InputStream metadataIn = Files.newInputStream(metadata);
- SAXReader reader = new SAXReader();
- Document document = reader.read(metadataIn);
- Element rootElement = document.getRootElement();
- QTIMetadata enricher = new QTIMetadata(rootElement, qItemTypeDao, taxonomyLevelDao, qEduContextDao);
- enricher.toQuestion(item);
+ if(path != null) {
+ Path metadata = path.resolve(path.getFileName().toString() + "_metadata.xml");
+ InputStream metadataIn = Files.newInputStream(metadata);
+ SAXReader reader = new SAXReader();
+ Document document = reader.read(metadataIn);
+ Element rootElement = document.getRootElement();
+ QTIMetadata enricher = new QTIMetadata(rootElement, qItemTypeDao, taxonomyLevelDao, qEduContextDao);
+ enricher.toQuestion(item);
+ }
return true;
+ } catch(NoSuchFileException e) {
+ //nothing to do
+ return true;
} catch (Exception e) {
log.error("", e);
return false;
--
GitLab