From 7e95e8cc16767c344823e66acfc2a0b9f769d95a Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Wed, 16 Sep 2009 12:09:23 +0000 Subject: [PATCH] Merged V3.2 to HEAD 16297: Reversed some changes introduced prematurely by 16296 16296: Merged V3.1 to V3.2 16294: ETHREEOH-2846: Propagate exceptions when searching for web scripts - Stops share from successfully initializing when there are I/O errors traversing its class path store 16292: Merged V3.2 to V3.1 (record only) 15798: ETHREEOH-2686: Resolved problem with site dashboards disappearing after NTLM login / session expiry git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../scripts/activities/TemplatesWebScript.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java b/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java index a59835c480..657f1a6309 100644 --- a/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java @@ -24,16 +24,17 @@ */ package org.alfresco.repo.web.scripts.activities; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.web.scripts.DeclarativeWebScript; import org.alfresco.web.scripts.SearchPath; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.Store; +import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.WebScriptRequest; /** @@ -73,10 +74,17 @@ public class TemplatesWebScript extends DeclarativeWebScript Set templatePaths = new HashSet(); for (Store apiStore : searchPath.getStores()) { - for(String templatePath : apiStore.getDocumentPaths(path, false, templatePattern)) - { - templatePaths.add(templatePath); - } + try + { + for (String templatePath : apiStore.getDocumentPaths(path, false, templatePattern)) + { + templatePaths.add(templatePath); + } + } + catch (IOException e) + { + throw new WebScriptException("Failed to search for templates from store " + apiStore, e); + } } Map model = new HashMap();