[freenet-cvs] r16929 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2008-01-05 22:04:09 +0000 (Sat, 05 Jan 2008)
New Revision: 16929

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
refactor: collidable -> collisionPossible

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
22:03:45 UTC (rev 16928)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
22:04:09 UTC (rev 16929)
@@ -83,7 +83,7 @@
        private final String name;
        /** Callback which translates records to blocks and back, specifies the 
size of blocks etc. */
        private final StoreCallback callback;
-       private final boolean collidable;
+       private final boolean collisionPossible;

        private long lastRecentlyUsed;
        private final Object lastRecentlyUsedSync = new Object();
@@ -241,7 +241,7 @@
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
                logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
                this.callback = callback;
-               this.collidable = callback.collisionPossible();
+               this.collisionPossible = callback.collisionPossible();
                this.dataBlockSize = callback.dataLength();
                this.headerBlockSize = callback.headerLength();
                this.keyLength = callback.fullKeyLength();
@@ -1002,7 +1002,7 @@
                this.keyLength = callback.fullKeyLength();
                this.dataBlockSize = callback.dataLength();
                this.headerBlockSize = callback.headerLength();
-               this.collidable = callback.collisionPossible();
+               this.collisionPossible = callback.collisionPossible();
                callback.setStore(this);
                this.freeBlocks = new SortedLongSet();
                this.maxBlocksInStore=maxChkBlocks;
@@ -1345,7 +1345,7 @@
                        boolean overwrite) throws KeyCollisionException, 
IOException {
                StorableBlock oldBlock = fetch(routingkey, fullKey, false);
                if(oldBlock != null) {
-                       if(!collidable) return;
+                       if(!collisionPossible) return;
                        if(!block.equals(oldBlock)) {
                                if(!overwrite)
                                        throw new KeyCollisionException();