[exo-jcr-commits] exo-jcr SVN: r3466 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query: lucene and 1 other directory.
Author: nzamosenchuk
Date: 2010-11-17 02:15:48 -0500 (Wed, 17 Nov 2010)
New Revision: 3466
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ErrorLog.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
JCR-1504 : close errorLog output stream in SearchManager.stop() ;
EXOJCR - 1060 : close errorLog output stream in SearchManager.stop() ;
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ErrorLog.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ErrorLog.java 2010-11-17
07:01:11 UTC (rev 3465)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ErrorLog.java 2010-11-17
07:15:48 UTC (rev 3466)
@@ -17,8 +17,8 @@
package org.exoplatform.services.jcr.impl.core.query;
+import org.exoplatform.commons.utils.PrivilegedFileHelper;
import org.exoplatform.commons.utils.SecurityHelper;
-import org.exoplatform.commons.utils.PrivilegedFileHelper;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -31,6 +31,7 @@
import java.io.InputStreamReader;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Iterator;
@@ -311,4 +312,29 @@
}
}
+ /**
+ * Closes ErrorLog and frees resources associated with it.
+ */
+ public void close()
+ {
+ SecurityHelper.doPriviledgedAction(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ if (out != null)
+ {
+ try
+ {
+ out.close();
+ }
+ catch (IOException e)
+ {
+ out = null;
+ }
+ }
+ return null;
+ }
+ });
+ }
+
}
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 2010-11-17
07:01:11 UTC (rev 3465)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-11-17
07:15:48 UTC (rev 3466)
@@ -875,6 +875,7 @@
{
spellChecker.close();
}
+ errorLog.close();
index.close();
getContext().destroy();
closed = true;