knguyen 2004/08/25 17:21:04 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/search JahiaSearchBaseService.java
Log:
- update locks folder as it has changed since lucene > 1.3
Revision Changes Path
1.42.2.6 +11 -11
jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.42.2.5&r2=1.42.2.6&f=h
Index: JahiaSearchBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/JahiaSearchBaseService.java,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.6
diff -u -r1.42.2.5 -r1.42.2.6
--- JahiaSearchBaseService.java 25 Aug 2004 14:45:58 -0000 1.42.2.5
+++ JahiaSearchBaseService.java 25 Aug 2004 15:21:03 -0000 1.42.2.6
@@ -1080,27 +1080,27 @@
* @param startingDirectory directory in which to remove the *.lock files
*/
private synchronized void removeStaleLockFiles (String startingDirectory) {
- File f = new File (startingDirectory);
+
+ // With lucene > 1.3, the locks are created in "java.io.tmpdir", not in the
search index folder
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ File f = new File (tmpDir);
if (!f.isDirectory ()) {
logger.warn ("Called on a file name, exiting...");
return;
}
- String[] dirContents = f.list ();
+ File[] files = f.listFiles();
- for (int i = 0; i < dirContents.length; i++) {
- String curEntry = startingDirectory + File.separator +
- dirContents[i];
- File curFile = new File (curEntry);
- if (curFile.isDirectory ()) {
- // let's do a recursive call for this directory.
- removeStaleLockFiles (curFile.toString ());
- } else if (curFile.toString ().endsWith (".lock")) {
+ for (int i = 0; i < files.length; i++) {
+ File curFile = files[i];
+ if (curFile.isFile() &&
curFile.getName().toLowerCase().startsWith("lucene")
+ && curFile.getName().toLowerCase().endsWith (".lock")) {
logger.debug ("Removing stale lock file : [" + curFile.toString ()
+ "]");
- curFile.delete ();
+ curFile.delete();
}
}
+
}
/**
