inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.2/MNT-17550' into 'release/V2.2.0.x'

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

See merge request !114
This commit is contained in:
David Webster
2017-03-09 13:16:14 +00:00
parent fbb55126d7 c6a698ad55
commit 52d46bef65
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-server/pom.xml
View File

@@ -195,6 +195,12 @@
<classifier>config</classifier> <classifier>config</classifier>
</dependency> </dependency>
<!-- Test dependencies --> <!-- Test dependencies -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.10</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@@ -273,4 +279,4 @@
<version>1.4.01</version> <version>1.4.01</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

10
rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
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;