You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2014/07/29 18:01:34 UTC
svn commit: r1614396 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Author: jukka
Date: Tue Jul 29 16:01:34 2014
New Revision: 1614396
URL: http://svn.apache.org/r1614396
Log:
1.0.4: Merged revisions 1614384 and 1614385 (OAK-2002)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1614384-1614385
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1614396&r1=1614395&r2=1614396&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Tue Jul 29 16:01:34 2014
@@ -191,19 +191,19 @@ public class FileStore implements Segmen
String.format(FILE_NAME_FORMAT, writeNumber, "a"));
this.writer = new TarWriter(writeFile);
- LinkedList<RecordId> heads = newLinkedList();
+ LinkedList<String> heads = newLinkedList();
String line = journalFile.readLine();
while (line != null) {
int space = line.indexOf(' ');
if (space != -1) {
- heads.add(RecordId.fromString(tracker, line.substring(0, space)));
+ heads.add(line.substring(0, space));
}
line = journalFile.readLine();
}
RecordId id = null;
while (id == null && !heads.isEmpty()) {
- RecordId last = heads.removeLast();
+ RecordId last = RecordId.fromString(tracker, heads.removeLast());
SegmentId segmentId = last.getSegmentId();
if (containsSegment(
segmentId.getMostSignificantBits(),