MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.

This commit is contained in:
David Webster
2017-03-08 16:05:00 +00:00
parent b04584ba58
commit e85ea821ad

View File

@@ -33,7 +33,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
finally finally
{ {
recordService.enablePropertyEditableCheck(); recordService.enablePropertyEditableCheck();
recordService.disablePropertyEditableCheck(result.getNodeRef()); if (result != null)
{
recordService.disablePropertyEditableCheck(result.getNodeRef());
}
} }
return result; return result;
@@ -52,7 +55,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
finally finally
{ {
recordService.enablePropertyEditableCheck(); recordService.enablePropertyEditableCheck();
recordService.disablePropertyEditableCheck(result.getNodeRef()); if (result != null)
{
recordService.disablePropertyEditableCheck(result.getNodeRef());
}
} }
return result; return result;