Author: toad
Date: 2007-04-14 15:16:49 +0000 (Sat, 14 Apr 2007)
New Revision: 12688
Modified:
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
indent
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-14
15:10:48 UTC (rev 12687)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-14
15:16:49 UTC (rev 12688)
@@ -1342,21 +1342,21 @@
byte[] header = new byte[headerBlockSize];
byte[] data = new byte[dataBlockSize];
try {
- synchronized(chkStore) {
- long seekTarget =
storeBlock.offset*(long)(dataBlockSize+headerBlockSize);
- try {
- chkStore.seek(seekTarget);
- } catch (IOException ioe) {
- if(seekTarget > (2l*1024*1024*1024)) {
- Logger.error(this, "Environment
does not support files bigger than 2 GB?");
- System.out.println("Environment
does not support files bigger than 2 GB? (exception to follow)");
- }
- Logger.error(this, "Caught IOException
on chkStore.seek("+seekTarget+ ')');
- throw ioe;
- }
- chkStore.readFully(header);
- chkStore.readFully(data);
- }
+ synchronized(chkStore) {
+ long seekTarget =
storeBlock.offset*(long)(dataBlockSize+headerBlockSize);
+ try {
+ chkStore.seek(seekTarget);
+ } catch (IOException ioe) {
+ if(seekTarget >
(2l*1024*1024*1024)) {
+ Logger.error(this,
"Environment does not support files bigger than 2 GB?");
+
System.out.println("Environment does not support files bigger than 2 GB?
(exception to follow)");
+ }
+ Logger.error(this, "Caught
IOException on chkStore.seek("+seekTarget+ ')');
+ throw ioe;
+ }
+ chkStore.readFully(header);
+ chkStore.readFully(data);
+ }
} catch (EOFException e) {
Logger.error(this, "No block");
c.close();
@@ -1470,19 +1470,19 @@
byte[] header = new byte[headerBlockSize];
byte[] data = new byte[dataBlockSize];
try {
- synchronized(chkStore) {
-
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
- chkStore.readFully(header);
- chkStore.readFully(data);
- }
+ synchronized(chkStore) {
+
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
+ chkStore.readFully(header);
+ chkStore.readFully(data);
+ }
} catch (EOFException e) {
- Logger.error(this, "No block");
- c.close();
- c = null;
- chkDB.delete(t, routingkeyDBE);
- t.commit();
- t = null;
- addFreeBlock(storeBlock.offset, true, "Data off end of
store file");
+ Logger.error(this, "No block");
+ c.close();
+ c = null;
+ chkDB.delete(t, routingkeyDBE);
+ t.commit();
+ t = null;
+ addFreeBlock(storeBlock.offset, true, "Data off
end of store file");
return null;
}
@@ -1605,10 +1605,10 @@
if(logMINOR) Logger.minor(this, "Reading from store...
"+storeBlock.offset+" ("+storeBlock.recentlyUsed+ ')');
// When will java have pread/pwrite? :(
try {
- synchronized(chkStore) {
-
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
- chkStore.readFully(data);
- }
+ synchronized(chkStore) {
+
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
+ chkStore.readFully(data);
+ }
} catch (EOFException e) {
Logger.error(this, "No block");
c.close();
