Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

92636: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92607: Merged DEV (5.0.0) to 5.0.N (5.0.1)
         92583: ACE-3423: 'Search' subsystem does not start on MS SQL Server
         Disabled new transaction creation for lucene index recovery checks.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:55:10 +00:00
parent 6767b10737
commit 995242397c

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2010 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -363,7 +363,7 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
for (Transaction txn : txns) for (Transaction txn : txns)
{ {
count++; count++;
InIndex inIndex = isTxnPresentInIndex(txn, true); InIndex inIndex = isTxnPresentInIndex(txn, false);
if (inIndex == InIndex.NO) if (inIndex == InIndex.NO)
{ {
// Missing txn // Missing txn
@@ -388,7 +388,7 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
for (Transaction txn : txns) for (Transaction txn : txns)
{ {
count++; count++;
current = isTxnPresentInIndex(txn, true); current = isTxnPresentInIndex(txn, false);
if (current == InIndex.NO) if (current == InIndex.NO)
{ {
// Missing txn // Missing txn