From 43b86f55c60936428b3b22b1cd3af1bb558d8e03 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 7 Mar 2016 11:09:48 +0100
Subject: [PATCH] no-jira: don't be fooled by blank at the end of Calendar
URL's
---
src/main/java/org/olat/commons/calendar/ICalServlet.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/commons/calendar/ICalServlet.java b/src/main/java/org/olat/commons/calendar/ICalServlet.java
index bde343b3375..8bd448aa933 100644
--- a/src/main/java/org/olat/commons/calendar/ICalServlet.java
+++ b/src/main/java/org/olat/commons/calendar/ICalServlet.java
@@ -141,7 +141,14 @@ public class ICalServlet extends HttpServlet {
private void getIcalDocument(String requestUrl, HttpServletResponse response)
throws ValidationException, IOException {
// get the individual path tokens
- String pathInfo = requestUrl.replaceAll(".ics", "");
+ String pathInfo;
+ int icsIndex = requestUrl.indexOf(".ics");
+ if(icsIndex > 0) {
+ pathInfo = requestUrl.substring(0, icsIndex);
+ } else {
+ pathInfo = requestUrl;
+ }
+
String[] pathInfoTokens = pathInfo.split("/");
if(pathInfoTokens.length < 4) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, requestUrl);
--
GitLab