dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Long.Max_Value wrap around bug

Browse Source
This commit is contained in:
nathan 2014-09-28 17:24:45 +02:00
parent 035159ed6c
commit c34b2ea222
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dorkbox-Util/src/dorkbox/util/storage/StorageBase.java
View File

@ -258,7 +258,7 @@ public class StorageBase {
} }
return readRecordData; return readRecordData;
} catch (IOException e) { } catch (Exception e) {
this.logger.error("Error while geting data from disk", e); this.logger.error("Error while geting data from disk", e);
return null; return null;
} }
@ -345,7 +345,7 @@ public class StorageBase {
if (this.memoryIndex.size() == 1) { if (this.memoryIndex.size() == 1) {
// if we are the ONLY one, then we can do things differently. // if we are the ONLY one, then we can do things differently.
// just dump the data agian to disk. // just dump the data agian to disk.
FileLock lock = this.file.getChannel().lock(this.dataPosition, Long.MAX_VALUE, false); // don't know how big it is, so max value it FileLock lock = this.file.getChannel().lock(this.dataPosition, Long.MAX_VALUE-this.dataPosition, false); // don't know how big it is, so max value it
this.file.seek(this.dataPosition); // this is the end of the file, we know this ahead-of-time this.file.seek(this.dataPosition); // this is the end of the file, we know this ahead-of-time
metaData.writeDataFast(this.kryo, object, fileOutputStream); metaData.writeDataFast(this.kryo, object, fileOutputStream);
lock.release(); lock.release();
@ -435,7 +435,7 @@ public class StorageBase {
private void deleteRecordData(Metadata deletedRecord) throws IOException { private void deleteRecordData(Metadata deletedRecord) throws IOException {
if (this.file.length() == deletedRecord.dataPointer + deletedRecord.dataCapacity) { if (this.file.length() == deletedRecord.dataPointer + deletedRecord.dataCapacity) {
// shrink file since this is the last record in the file // shrink file since this is the last record in the file
FileLock lock = this.file.getChannel().lock(deletedRecord.dataPointer, Long.MAX_VALUE, false); FileLock lock = this.file.getChannel().lock(deletedRecord.dataPointer, Long.MAX_VALUE-deletedRecord.dataPointer, false);
this.file.setLength(deletedRecord.dataPointer); this.file.setLength(deletedRecord.dataPointer);
lock.release(); lock.release();
} else { } else {