From 26670344e3d7637e14e3afad85231590e8ac9730 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 20 Oct 2013 07:17:37 +0000
Subject: [PATCH] =?UTF-8?q?Durch=20die=20=C3=84nderungen=20an=20ccm-cms:co?=
 =?UTF-8?q?m.arsdigita.cms.ServiceServlet=20in=20Revision=20r2143=20ist=20?=
 =?UTF-8?q?die=20in=20Revision=20r1712=20vorgenommene=20=C3=84nderung,=20d?=
 =?UTF-8?q?ie=20es=20erlaubte,=20den=20Dateinamen=20in=20einen=20Download-?=
 =?UTF-8?q?Link=20zu=20inkludieren,=20verloren=20gegangen.=20Der=20Dateina?=
 =?UTF-8?q?me=20wird=20allerdings=20von=20einigen=20externen=20Tools,=20z.?=
 =?UTF-8?q?B.=20Webstatistikprogrammen=20wie=20Piwik=20ben=C3=B6tigt,=20um?=
 =?UTF-8?q?=20die=20Links=20zu=20Dateien=20(z.B.=20PDFs)=20als=20Download?=
 =?UTF-8?q?=20erfassen=20zu=20k=C3=B6nnen.=20Daher=20wird=20mit=20dieser?=
 =?UTF-8?q?=20Revision=20die=20entsprechende=20=C3=84nderung=20aus=20Revis?=
 =?UTF-8?q?ion=20r1712=20wieder=20hergestellt.=20Diese=20=C3=84nderung=20s?=
 =?UTF-8?q?teht=20*nicht*=20in=20Konfkikt=20mit=20den=20=C3=84nderungen=20?=
 =?UTF-8?q?aus=20Revision=20r2143.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2362 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms/src/com/arsdigita/cms/ServiceServlet.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java b/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
index a684a3f3f..5db355bf6 100644
--- a/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
+++ b/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
@@ -174,6 +174,19 @@ public class ServiceServlet extends BaseApplicationServlet {
         /* Determine the service requested by url                             */
         ResourceHandler serviceResource = getResource(url);
         
+        //Retry without last part which is may the name of the file to serve which is included
+        //only for the visitor and and statistic programs like Piwik.
+        if (serviceResource == null) {
+            final String[] tokens = url.split("/");
+            
+            final StringBuilder altUrlBuilder = new StringBuilder('/');            
+            for(int i = 0; i < tokens.length - 1; i++) {
+                altUrlBuilder.append(tokens[i]);
+                altUrlBuilder.append('/');
+            }
+            serviceResource = getResource(altUrlBuilder.toString());
+        }
+        
         if ( serviceResource != null ) {
             // Serve the serviceResource.
             serviceResource.init();