Author: j16sdiz
Date: 2008-05-26 09:34:05 +0000 (Mon, 26 May 2008)
New Revision: 20096
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
indent
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
---
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-26 09:33:39 UTC (rev 20095)
+++
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-26 09:34:05 UTC (rev 20096)
@@ -189,27 +189,27 @@
if (oldEntry != null) {
long oldOffset = oldEntry.curOffset;
try {
- try {
- StorableBlock oldBlock =
oldEntry.getStorableBlock(routingKey, fullKey);
- if (!collisionPossible)
- return;
- if (block.equals(oldBlock)) {
- return; // already in store
- } else {
- if (!overwrite)
- throw new
KeyCollisionException();
+ try {
+ StorableBlock oldBlock =
oldEntry.getStorableBlock(routingKey, fullKey);
+ if (!collisionPossible)
+ return;
+ if (block.equals(oldBlock)) {
+ return; // already in store
+ } else {
+ if (!overwrite)
+ throw new
KeyCollisionException();
+ }
+ } catch (KeyVerifyException e) {
+ // ignore
}
- } catch (KeyVerifyException e) {
- // ignore
- }
-
- // Overwrite old offset
- if (updateBloom)
-
bloomFilter.updateFilter(getDigestedRoutingKey(routingKey));
- Entry entry = new Entry(routingKey, header, data);
- writeEntry(entry, oldOffset);
- incWrites();
- return;
+
+ // Overwrite old offset
+ if (updateBloom)
+
bloomFilter.updateFilter(getDigestedRoutingKey(routingKey));
+ Entry entry = new Entry(routingKey, header,
data);
+ writeEntry(entry, oldOffset);
+ incWrites();
+ return;
} finally {
unlockEntry(oldOffset);
}
@@ -241,8 +241,8 @@
}
// no free blocks, overwrite the first one
- if (!lockEntry(offset[0])) {
- Logger.error(this, "can't lock entry: " +
offset[0]);
+ if (!lockEntry(offset[0])) {
+ Logger.error(this, "can't lock entry: " + offset[0]);
return;
}
try {
