From 943590d52b2cb68d96f414c97ccb876a8b03fae9 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 15:27:24 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 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 --- .../repo/node/index/IndexRecoveryBootstrapBean.java | 4 ++-- .../AbstractLuceneIndexerAndSearcherFactory.java | 2 +- .../impl/solr/SolrChildApplicationContextFactory.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java b/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java index b06d052b06..8235342bde 100644 --- a/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java +++ b/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java @@ -29,7 +29,7 @@ public class IndexRecoveryBootstrapBean extends AbstractLifecycleBean protected final static Log log = LogFactory.getLog(IndexRecoveryBootstrapBean.class); IndexRecovery indexRecoveryComponent; - + @Override protected void onBootstrap(ApplicationEvent event) { @@ -37,7 +37,7 @@ public class IndexRecoveryBootstrapBean extends AbstractLifecycleBean log.info("Checking/Recovering indexes ..."); indexRecoveryComponent.reindex(); - + } @Override diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java index 1d91331f08..9c1e5db11e 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java @@ -771,7 +771,7 @@ public abstract class AbstractLuceneIndexerAndSearcherFactory extends AbstractIn { for (LuceneIndexer indexer : indexers.values()) { - if(destroyed && Thread.currentThread().isDaemon()) + if (destroyed && Thread.currentThread().isDaemon()) { rollback(); throw new IndexerException("Destroyed .."); diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java index 53b7b9f2d6..836819bd89 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java +++ b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java @@ -137,11 +137,11 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE)) { - if(alfrescoActive == null || alfrescoActive.isEmpty()) - { - // Admin Console is expecting a true/false value, not blank - return "false"; - } + if (alfrescoActive == null || alfrescoActive.isEmpty()) + { + // Admin Console is expecting a true/false value, not blank + return "false"; + } return alfrescoActive; } else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG))