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 V3.1 to HEAD

Browse Source 
13484: ETHREEOH-1547: Do not set requiresNew flag and propagate exceptions in BaseDialogBean
   13383: ETHREEOH-1220: Update LDAP-authentication-context to include allowGetEnabled entry to support Share
   13381: ETHREEOH-1181: NTLM authentication periodically fails over CIFS - "Read-Write transaction started within read-only transaction"
   13376: ETHREEOH-279: Friendly error message when cm:filename regular expression constraint is violated
   13364: ETHREEOH-814: Correct character encoding issues in LDAP synchronization
   13353: ETHREEOH-1444: Ability to run Alfresco from unexploded .war file with embedded license
   13328: ETHREEOH-1400: Prevent TLD warnings on Weblogic startup
   13183: Follow up to 13177: Fixes for Weblogic compatibility
   13177: Fixes for Weblogic compatibility
   13109: Build/test fix (to avoid unintentional import via application-context.xml)
   13100: Checkpoint for new DM index check (enterprise-only)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-03-10 14:27:09 +00:00
parent 054d6d46b0
commit 1264fca386
14 changed files with 295 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java
View File

@@ -240,6 +240,12 @@ public abstract class AbstractReindexComponent implements IndexRecovery
{
try
{
// started
if (logger.isDebugEnabled())
{
logger.debug("Reindex work started: " + this);
}
AuthenticationUtil.pushAuthentication();
// authenticate as the system user
AuthenticationUtil.setRunAsUserSystem();
@@ -284,7 +290,7 @@ public abstract class AbstractReindexComponent implements IndexRecovery
}
}
protected enum InIndex
public enum InIndex
{
YES, NO, INDETERMINATE;
}
@@ -348,7 +354,7 @@ public abstract class AbstractReindexComponent implements IndexRecovery
* @param txn a specific transaction
* @return Returns <tt>true</tt> if the transaction is definitely in the index
*/
protected InIndex isTxnPresentInIndex(final Transaction txn)
public InIndex isTxnPresentInIndex(final Transaction txn)
{
if (txn == null)
{
@@ -356,9 +362,9 @@ public abstract class AbstractReindexComponent implements IndexRecovery
}
final Long txnId = txn.getId();
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Checking for transaction in index: " + txnId);
logger.trace("Checking for transaction in index: " + txnId);
}
// Check if the txn ID is present in any store's index
@@ -398,6 +404,7 @@ public abstract class AbstractReindexComponent implements IndexRecovery
{
// There were deleted nodes only. Check that all the deleted nodes were
// removed from the index otherwise it is out of date.
result = InIndex.YES;
for (StoreRef storeRef : storeRefs)
{
if (!haveNodesBeenRemovedFromIndex(storeRef, txn))
@@ -444,17 +451,17 @@ public abstract class AbstractReindexComponent implements IndexRecovery
if (results.length() > 0)
{
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Index has results for txn " + txnId + " for store " + storeRef);
logger.trace("Index has results for txn " + txnId + " for store " + storeRef);
}
return true; // there were updates/creates and results for the txn were found
}
else
{
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Transaction " + txnId + " not in index for store " + storeRef + ". Possibly out of date.");
logger.trace("Transaction " + txnId + " not in index for store " + storeRef + ". Possibly out of date.");
}
return false;
}
@@ -474,9 +481,9 @@ public abstract class AbstractReindexComponent implements IndexRecovery
boolean foundNodeRef = false;
for (NodeRef nodeRef : nodeRefs)
{
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug("Searching for node in index: \n" +
logger.trace("Searching for node in index: \n" +
" node: " + nodeRef + "\n" +
" txn: " + txnId);
}
@@ -514,9 +521,9 @@ public abstract class AbstractReindexComponent implements IndexRecovery
else
{
// No nodes found
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
logger.debug(" --> Node not found (OK)");
logger.trace(" --> Node not found (OK)");
}
}
return !foundNodeRef;