Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no

pom.xml

@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.4.1-SNAPSHOT</version>
+   <version>3.4.2-SNAPSHOT</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>

rm-automation/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.4.1-SNAPSHOT</version>
+      <version>3.4.2-SNAPSHOT</version>
    </parent>
 
    <licenses>

rm-automation/rm-automation-community-rest-api/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.4.1-SNAPSHOT</version>
+      <version>3.4.2-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.4.1-SNAPSHOT</version>
+      <version>3.4.2-SNAPSHOT</version>
    </parent>
 
    <licenses>

rm-community/rm-community-repo/pom.xml

@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.4.1-SNAPSHOT</version>
+      <version>3.4.2-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java

@@ -503,52 +503,7 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
     @Override
     public boolean hasDisposableItems(DispositionSchedule dispositionSchdule)
     {
-        ParameterCheck.mandatory("dispositionSchedule", dispositionSchdule);
+    	return !getDisposableItems(dispositionSchdule).isEmpty();
-
-        // Get the associated container
-        NodeRef rmContainer = getAssociatedRecordsManagementContainer(dispositionSchdule);
-
-        return hasDisposableItemsImpl(dispositionSchdule.isRecordLevelDisposition(), rmContainer);
-    }
-
-    /**
-     * Method that provides a boolean if given Records Management Container has disposable items.
-     * This method is similar to getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) but with improved performance:
-     * For RecordLevelDisposition it will limit Record retrieval to 1.
-     * Early returns once the first occurrence is found.
-     * @param isRecordLevelDisposition
-     * @param rmContainer
-     * @return
-     */
-    private boolean hasDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer)
-    {
-        List<NodeRef> items = filePlanService.getAllContained(rmContainer);
-        for (NodeRef item : items)
-        {
-            if (recordFolderService.isRecordFolder(item))
-            {
-                if (isRecordLevelDisposition)
-                {
-                    List<ChildAssociationRef> assocs = nodeService.getChildAssocs(item, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL, 1, true);
-                    if (!assocs.isEmpty())
-                    {
-                        return true;
-                    }
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
-            {
-                if (hasDisposableItemsImpl(isRecordLevelDisposition, item));
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
     }
 
     /**

rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.4.1-SNAPSHOT</version>
+      <version>3.4.2-SNAPSHOT</version>
    </parent>
 
    <properties>