Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

115461 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113729 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113704 adavis: Fix build error after
            Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
               113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
                  113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:10:38 +00:00
parent 4165e47032
commit b29ff05f77

View File

@@ -760,7 +760,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return selectNodeAssocsBySourceAndPropertyValue(sourceNodeId, typeQNameId, null, null);
}
@SuppressWarnings("unchecked")
@Override
protected List<NodeAssocEntity> selectNodeAssocsBySourceAndPropertyValue(Long sourceNodeId, Long typeQNameId, Long propertyQNameId, NodePropertyValue nodeValue)
{
@@ -776,7 +775,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
assoc.setPropertyQNameId(propertyQNameId);
assoc.setPropertyValue(nodeValue);
return (List<NodeAssocEntity>) template.selectList(SELECT_NODE_ASSOCS_BY_SOURCE_AND_PROPERTY_VALUE, assoc);
return template.selectList(SELECT_NODE_ASSOCS_BY_SOURCE_AND_PROPERTY_VALUE, assoc);
}
@SuppressWarnings("unchecked")