inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD

Browse Source 
33360 Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
      33325:    Fix for ALF-12481 The share admin page for editing SOLR properties sets read only properties - The repository will not restart as they are persisted and then throw an exception when set
      33356:    Fix for ALF-12482 Files uploaded through JSF are not indexed - using solr


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2012-01-23 14:44:22 +00:00
parent 0a724094ae
commit 920896a63a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
View File

@@ -262,6 +262,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
return null; return null;
} }
nodeDAO.setCheckNodeConsistency();
Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(nodeIds.get(0)); Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(nodeIds.get(0));
if (nodePair == null) if (nodePair == null)
{ {
@@ -381,6 +382,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
{ {
ArrayList<Pair<Path, QName>> categoryPaths = new ArrayList<Pair<Path, QName>>(); ArrayList<Pair<Path, QName>> categoryPaths = new ArrayList<Pair<Path, QName>>();
nodeDAO.setCheckNodeConsistency();
for (QName classRef : aspects) for (QName classRef : aspects)
{ {
AspectDefinition aspDef = dictionaryService.getAspect(classRef); AspectDefinition aspDef = dictionaryService.getAspect(classRef);
@@ -443,6 +445,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
private List<Long> preCacheNodes(NodeMetaDataParameters nodeMetaDataParameters) private List<Long> preCacheNodes(NodeMetaDataParameters nodeMetaDataParameters)
{ {
nodeDAO.setCheckNodeConsistency();
int maxResults = nodeMetaDataParameters.getMaxResults(); int maxResults = nodeMetaDataParameters.getMaxResults();
boolean isLimitSet = (maxResults != 0 && maxResults != Integer.MAX_VALUE); boolean isLimitSet = (maxResults != 0 && maxResults != Integer.MAX_VALUE);
@@ -483,6 +486,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
// ALF-10641 // ALF-10641
// Residual properties are un-indexed -> break serlialisation // Residual properties are un-indexed -> break serlialisation
nodeDAO.setCheckNodeConsistency();
Map<QName, Serializable> sourceProps = nodeDAO.getNodeProperties(nodeId); Map<QName, Serializable> sourceProps = nodeDAO.getNodeProperties(nodeId);
props = new HashMap<QName, Serializable>((int)(sourceProps.size() * 1.3)); props = new HashMap<QName, Serializable>((int)(sourceProps.size() * 1.3));
for(QName propertyQName : sourceProps.keySet()) for(QName propertyQName : sourceProps.keySet())
@@ -879,6 +883,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
@Override @Override
public Long getMaxTxnCommitTime() public Long getMaxTxnCommitTime()
{ {
nodeDAO.setCheckNodeConsistency();
return nodeDAO.getMaxTxnCommitTime(); return nodeDAO.getMaxTxnCommitTime();
} }
} }