Author: tolusha Date: 2012-03-06 10:55:33 -0500 (Tue, 06 Mar 2012) New Revision: 5822 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java Log: EXOJCR-1797: Exception while stopping AS Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-03-06 14:26:18 UTC (rev 5821) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-03-06 15:55:33 UTC (rev 5822) @@ -1239,37 +1239,40 @@ */ public void close() { - // cleanup resources obtained by filters - if (recoveryFilters != null) + if (!closed) { - for (AbstractRecoveryFilter filter : recoveryFilters) + // cleanup resources obtained by filters + if (recoveryFilters != null) { - filter.close(); + for (AbstractRecoveryFilter filter : recoveryFilters) + { + filter.close(); + } + recoveryFilters.clear(); + recoveryFilters = null; } - recoveryFilters.clear(); - recoveryFilters = null; - } - if (synonymProviderConfigFs != null) - { - try + if (synonymProviderConfigFs != null) { - synonymProviderConfigFs.close(); + try + { + synonymProviderConfigFs.close(); + } + catch (IOException e) + { + log.warn("Exception while closing FileSystem", e); + } } - catch (IOException e) + if (spellChecker != null) { - log.warn("Exception while closing FileSystem", e); + spellChecker.close(); } + errorLog.close(); + index.close(); + getContext().destroy(); + closed = true; + log.info("Index closed: " + path); } - if (spellChecker != null) - { - spellChecker.close(); - } - errorLog.close(); - index.close(); - getContext().destroy(); - closed = true; - log.info("Index closed: " + path); } /**