Merge branch 'feature/RM-6831_SecuritySonarFix' into 'master'

Resolve RM-6831 "Feature/ securitysonarfix"

Closes RM-6831

See merge request records-management/records-management!1189
This commit is contained in:
Ross Gale
2019-06-14 14:15:05 +01:00

View File

@@ -123,7 +123,7 @@ public class SearchTypesFactory
filterNodeTypeQName = pair.getFirst();
includeSubTypes = pair.getSecond();
if (nodeTypeQNameStr.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER))
if (filterNodeTypeQName.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER))
{
includeUnfiledRecordFolders = true;
}
@@ -219,7 +219,7 @@ public class SearchTypesFactory
Pair<QName, Boolean> pair = parseNodeTypeFilter(nodeTypeQNameStr);
filterNodeTypeQName = pair.getFirst();
if (nodeTypeQNameStr.equals(RecordsManagementModel.TYPE_RECORD_FOLDER))
if (filterNodeTypeQName.equals(RecordsManagementModel.TYPE_RECORD_FOLDER))
{
includeRecordFolders = true;