From 4dcf72e186f1df36a61a29e5ff5f83dd600562f5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 31 Jan 2017 16:25:23 +0100
Subject: [PATCH] OO-2482: prevent NPE in uri calculation method
---
.../ui/components/AssessmentRenderFunctions.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java b/src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java
index caa34803e7c..d6928f5fde1 100644
--- a/src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java
+++ b/src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java
@@ -616,14 +616,11 @@ public class AssessmentRenderFunctions {
</xsl:function>
*/
public static final String convertLink(AssessmentObjectComponent component, ResolvedAssessmentItem resolvedAssessmentItem, String uri) {
- if(uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("mailto:")) {
+ if(uri != null && uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("mailto:")) {
return uri;
}
-
+
String relativePath = component.relativePathTo(resolvedAssessmentItem);
- uri = component.getMapperUri() + "/file?href=" + relativePath + uri;
- return uri;
+ return component.getMapperUri() + "/file?href=" + relativePath + (uri == null ? "" : uri);
}
-
-
-}
+}
\ No newline at end of file
--
GitLab