From 768f33d45e0c94450fd0d142df6767e2661ea009 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Tue, 1 Jul 2014 15:31:44 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 75087: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 73975: Better handling/logging of ModuleDetails version errors git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/module/ModuleDetailsImpl.java | 9 ++++++++- .../java/org/alfresco/repo/module/ModuleServiceImpl.java | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java index fe01dfe55b..8ffb999dc1 100644 --- a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java +++ b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java @@ -134,7 +134,14 @@ public class ModuleDetailsImpl implements ModuleDetails } else { - version = new VersionNumber(trimmedProperties.getProperty(PROP_VERSION)); + try + { + version = new VersionNumber(trimmedProperties.getProperty(PROP_VERSION)); + } + catch (Throwable e) + { + throw new AlfrescoRuntimeException("Unable to parse version information: " + trimmedProperties.getProperty(PROP_VERSION), e); + } } // TITLE title = trimmedProperties.getProperty(PROP_TITLE); diff --git a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java index fd3da5d821..46b11d49fc 100644 --- a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java +++ b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java @@ -238,6 +238,7 @@ public class ModuleServiceImpl implements ApplicationContextAware, ModuleService } catch (Throwable e) { + logger.error("Unable to use module information.",e); throw AlfrescoRuntimeException.create(e, ERR_UNABLE_TO_OPEN_MODULE_PROPETIES, resource); } }