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
This commit is contained in:
Will Abson
2014-07-01 15:31:44 +00:00
parent 1b64f0c442
commit 768f33d45e
2 changed files with 9 additions and 1 deletions

View File

@@ -133,9 +133,16 @@ public class ModuleDetailsImpl implements ModuleDetails
missingProperties.add(PROP_VERSION); missingProperties.add(PROP_VERSION);
} }
else else
{
try
{ {
version = new VersionNumber(trimmedProperties.getProperty(PROP_VERSION)); 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
title = trimmedProperties.getProperty(PROP_TITLE); title = trimmedProperties.getProperty(PROP_TITLE);
if (title == null) { missingProperties.add(PROP_TITLE); } if (title == null) { missingProperties.add(PROP_TITLE); }

View File

@@ -238,6 +238,7 @@ public class ModuleServiceImpl implements ApplicationContextAware, ModuleService
} }
catch (Throwable e) catch (Throwable e)
{ {
logger.error("Unable to use module information.",e);
throw AlfrescoRuntimeException.create(e, ERR_UNABLE_TO_OPEN_MODULE_PROPETIES, resource); throw AlfrescoRuntimeException.create(e, ERR_UNABLE_TO_OPEN_MODULE_PROPETIES, resource);
} }
} }