Author: nzamosenchuk Date: 2011-07-07 05:08:13 -0400 (Thu, 07 Jul 2011) New Revision: 4609 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java Log: EXOJCR-1068 : fixed JBossCache MBeans unregistration for Indexer. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2011-07-07 08:29:27 UTC (rev 4608) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2011-07-07 09:08:13 UTC (rev 4609) @@ -161,6 +161,13 @@ } /** + * Frees resources associated with changes filter + */ + public void close() + { + } + + /** * @param removedNodes * @param addedNodes * @param updatedNodes @@ -245,7 +252,7 @@ { return log; } - + protected void logErrorChanges(QueryHandler logHandler, Set<String> removedNodes, Set<String> addedNodes) { try Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-07-07 08:29:27 UTC (rev 4608) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-07-07 09:08:13 UTC (rev 4609) @@ -621,6 +621,11 @@ public void stop() { handler.close(); + // ChangesFiler instance is one for both SearchManagers and close() must be invoked only once, + if (parentSearchManager != null) + { + changesFilter.close(); + } log.info("Search manager stopped"); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-07-07 08:29:27 UTC (rev 4608) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-07-07 09:08:13 UTC (rev 4609) @@ -202,11 +202,11 @@ return true; } - /** - * @see java.lang.Object#finalize() + /** + * {@inheritDoc} */ @Override - protected void finalize() throws Throwable + public void close() { try { @@ -222,9 +222,8 @@ }); } } - finally - { - super.finalize(); + catch (Exception e) { + log.warn("Not all JBoss Cache MBeans were unregistered."); } } }