From e85ea821add6f3283444ab0fe9a6314c12eaa33b Mon Sep 17 00:00:00 2001
From: David Webster <david@cognite.net>
Date: Wed, 8 Mar 2017 16:05:00 +0000
Subject: [PATCH 1/3] MNT-17550: Add in null checks to prevent NPE and allow
 correct error codes to bubble up.

---
 .../filefolder/ExtendedFileFolderServiceImpl.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
index 1cd984e2a6..10e3fc2a2c 100644
--- a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
@@ -33,7 +33,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
         finally
         {
             recordService.enablePropertyEditableCheck();
-            recordService.disablePropertyEditableCheck(result.getNodeRef());
+            if (result != null)
+            {
+                recordService.disablePropertyEditableCheck(result.getNodeRef());
+            }
         }
 
         return result;
@@ -52,7 +55,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
         finally
         {
             recordService.enablePropertyEditableCheck();
-            recordService.disablePropertyEditableCheck(result.getNodeRef());
+            if (result != null)
+            {
+                recordService.disablePropertyEditableCheck(result.getNodeRef());
+            }
         }
 
         return result;

From 0ae2d548c7ed0b12f3860064998f68da74d6feaa Mon Sep 17 00:00:00 2001
From: David Webster <david@cognite.net>
Date: Thu, 9 Mar 2017 10:55:37 +0000
Subject: [PATCH 2/3] MNT-17550: Update POM to work around build issue
 (BDE-996)

---
 rm-server/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 48e289188b..51c9be7a56 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -195,6 +195,12 @@
          <classifier>config</classifier>
       </dependency>
       <!-- Test dependencies -->
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <version>5.14.10</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>

From 217ec53966890193d8706b5bd021a93b5178171c Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Thu, 9 Mar 2017 11:37:13 +0000
Subject: [PATCH 3/3] MNT-17550/BDE-996 Fix TestNG version to 6.10

---
 rm-server/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 51c9be7a56..947f6ac454 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -198,7 +198,7 @@
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
-         <version>5.14.10</version>
+         <version>6.10</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -279,4 +279,4 @@
          <version>1.4.01</version>
       </dependency>
    </dependencies>
-</project>
\ No newline at end of file
+</project>