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

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

Browse Source 
93980: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93846: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93733: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93616: MNT-5564: Reverse Merge V4.1-BUG-FIX (4.1.10)
               93608: Reverse Merge V4.1-BUG-FIX (4.1.10)
                  << Has been causing a build failure for a week >>
                  93213: Merged DEV to V4.1-BUG-FIX (4.1.10)
                     70268: MNT-5564: Share Lucene tool in admin console works incorrectly
                        Backport changes from HEAD-QA to DEV:
                           53461: ALF-19108: Failed to switching SOLR search service to Lucene with AUTO or VALIDATE values of Index Recovery Mode
                              -Make search admin console page display when SOLR is not running.
                           53463: ALF-19108: Failed to switching SOLR search service to Lucene with AUTO or VALIDATE values of Index Recovery Mode
                               - Make sure cron trigger removes duplicate jobs.
                           54173: ALF-19108: Failed to switching SOLR search service to Lucene with AUTO or VALIDATE values of Index Recovery Mode
                               - Fix for ALF-19330 Exceptions when switching from Solr to Lucene in repo Admin console
                               - Fix for ALF-19108 Failed to switching SOLR search service to Lucene with AUTO or VALIDATE values of Index Recovery Mode
          


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:27:24 +00:00
parent 3fc6f0a3b3
commit 943590d52b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java
View File

@@ -29,7 +29,7 @@ public class IndexRecoveryBootstrapBean extends AbstractLifecycleBean
protected final static Log log = LogFactory.getLog(IndexRecoveryBootstrapBean.class); protected final static Log log = LogFactory.getLog(IndexRecoveryBootstrapBean.class);
IndexRecovery indexRecoveryComponent; IndexRecovery indexRecoveryComponent;
@Override @Override
protected void onBootstrap(ApplicationEvent event) protected void onBootstrap(ApplicationEvent event)
{ {
@@ -37,7 +37,7 @@ public class IndexRecoveryBootstrapBean extends AbstractLifecycleBean
log.info("Checking/Recovering indexes ..."); log.info("Checking/Recovering indexes ...");
indexRecoveryComponent.reindex(); indexRecoveryComponent.reindex();
} }
@Override @Override

2
source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java
View File

@@ -771,7 +771,7 @@ public abstract class AbstractLuceneIndexerAndSearcherFactory extends AbstractIn
{ {
for (LuceneIndexer indexer : indexers.values()) for (LuceneIndexer indexer : indexers.values())
{ {
if(destroyed && Thread.currentThread().isDaemon()) if (destroyed && Thread.currentThread().isDaemon())
{ {
rollback(); rollback();
throw new IndexerException("Destroyed .."); throw new IndexerException("Destroyed ..");

10
source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
View File

@@ -137,11 +137,11 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE)) if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE))
{ {
if(alfrescoActive == null || alfrescoActive.isEmpty()) if (alfrescoActive == null || alfrescoActive.isEmpty())
{ {
// Admin Console is expecting a true/false value, not blank // Admin Console is expecting a true/false value, not blank
return "false"; return "false";
} }
return alfrescoActive; return alfrescoActive;
} }
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG)) else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG))