fix misalignment between property wca:xmlschema of aspect wca:form in java constants and in xml model config. the property value was xmlschema in xml but simply schema in java. still unsure as to why this would be causing problems now - and not causing problems on my machine, but this is most likely the cause of the stacktraces we are seeing. thanks much to derek for helping track this down.

i've created issue WCM-477 to track any patch consequences of this realignment.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2007-05-04 01:09:26 +00:00
parent ca496b0c86
commit 41519858df
2 changed files with 31 additions and 2 deletions

View File

@@ -201,9 +201,20 @@ public class FormImpl
SAXException
{
final NodeService nodeService = this.getServiceRegistry().getNodeService();
final NodeRef schemaNodeRef = (NodeRef)
NodeRef schemaNodeRef = (NodeRef)
nodeService.getProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA);
if (schemaNodeRef == null)
{
LOGGER.debug(WCMAppModel.PROP_XML_SCHEMA + " not set on " + folderNodeRef +
", checking " + WCMAppModel.PROP_XML_SCHEMA_OLD);
schemaNodeRef = (NodeRef)
nodeService.getProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA_OLD);
if (schemaNodeRef != null)
{
nodeService.setProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA, schemaNodeRef);
}
}
if (schemaNodeRef == null)
{
throw new NullPointerException("expected property " + WCMAppModel.PROP_XML_SCHEMA +
" of " + folderNodeRef +