From 8befac525eafb0b265c2091bc1ecefb8b138eb6b Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Wed, 25 Jun 2014 05:37:35 +0000
Subject: [PATCH] RM-1324: Category becomes unavailable if import files
 exported via Export All action

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@74613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/util/ServiceBaseImpl.java     | 2 +-
 .../record/RecordServiceImplUnitTest.java                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
index 0fc8ac9723..d7b3ed8fd4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
@@ -338,7 +338,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
         if (nodeRef != null)
         {       
             result = (NodeRef)getInternalNodeService().getProperty(nodeRef, PROP_ROOT_NODEREF);
-            if (result == null)
+            if (result == null || !instanceOf(result, TYPE_FILE_PLAN))
             {
                 if (instanceOf(nodeRef, TYPE_FILE_PLAN))
                 {
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
index 99ee3c2194..241e705d61 100755
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
@@ -59,7 +59,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
     {
         super.before();
         
-        nonStandardFilePlanComponent = generateNodeRef();
+        nonStandardFilePlanComponent = generateNodeRef(TYPE_RECORD_CATEGORY);
         nonStandardFilePlan = generateNodeRef(TYPE_MY_FILE_PLAN);
         
         // set-up node service