From 4270a9ae80f9c9f64d72db5aac65afdbddcadb8f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 22:34:04 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57998: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57958: MNT-9961: Merged DEV to V4.2-BUG-FIX (4.2.1) 57894: MNT-9961: DB2: Upgrade from 4.0.2.40 to 4.2.1 fails with NPE during database schema bootstrap - Throw AlfrescoRuntimeException if script is not found for database dialect git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/domain/schema/SchemaBootstrap.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index 0f60e40698..0037bbc54e 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -1182,7 +1182,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean */ private InputStream getScriptInputStream(Class dialectClazz, String scriptUrl) throws Exception { - return getDialectResource(dialectClazz, scriptUrl).getInputStream(); + Resource resource = getDialectResource(dialectClazz, scriptUrl); + if (resource == null) + { + throw new AlfrescoRuntimeException("Script [ " + scriptUrl + " ] can't be found for " + dialectClazz); + } + return resource.getInputStream(); } /**