Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix silly bug that crept in during last trunk merge 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1073625 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Busch 2011-02-23 07:29:02 +00:00
parent 541a7263fa
commit 05bfc58294
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lucene/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -2085,12 +2085,12 @@ public class IndexWriter implements Closeable {
setDiagnostics(newSegment, "flush"); setDiagnostics(newSegment, "flush");
boolean success = false;
try {
if (useCompoundFile(newSegment)) { if (useCompoundFile(newSegment)) {
String compoundFileName = IndexFileNames.segmentFileName(newSegment.name, "", IndexFileNames.COMPOUND_FILE_EXTENSION); String compoundFileName = IndexFileNames.segmentFileName(newSegment.name, "", IndexFileNames.COMPOUND_FILE_EXTENSION);
message("creating compound file " + compoundFileName); message("creating compound file " + compoundFileName);
// Now build compound file // Now build compound file
boolean success = false;
try {
CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, compoundFileName); CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, compoundFileName);
for(String fileName : newSegment.files()) { for(String fileName : newSegment.files()) {
cfsWriter.addFile(fileName); cfsWriter.addFile(fileName);
@ -2103,6 +2103,7 @@ public class IndexWriter implements Closeable {
} }
newSegment.setUseCompoundFile(true); newSegment.setUseCompoundFile(true);
}
// Must write deleted docs after the CFS so we don't // Must write deleted docs after the CFS so we don't
// slurp the del file into CFS: // slurp the del file into CFS:
@ -2151,8 +2152,6 @@ public class IndexWriter implements Closeable {
} }
}
synchronized(this) { synchronized(this) {
segmentInfos.add(newSegment); segmentInfos.add(newSegment);
checkpoint(); checkpoint();