Author: j16sdiz
Date: 2008-05-13 12:10:46 +0000 (Tue, 13 May 2008)
New Revision: 19910
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
EOF Handling
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
---
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-13 11:14:18 UTC (rev 19909)
+++
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-13 12:10:46 UTC (rev 19910)
@@ -1030,16 +1030,14 @@
}
private Entry readOldItem(FileChannel fc) throws IOException {
- try {
- ByteBuffer bf = ByteBuffer.allocate((int)
entryTotalLength);
- do {
- fc.read(bf);
- } while (bf.hasRemaining());
- bf.flip();
- return new Entry(bf);
- } catch (EOFException e) {
- return null;
- }
+ ByteBuffer bf = ByteBuffer.allocate((int)
entryTotalLength);
+ do {
+ int status = fc.read(bf);
+ if (status == -1)
+ return null;
+ } while (bf.hasRemaining());
+ bf.flip();
+ return new Entry(bf);
}
/**
