Author: j16sdiz
Date: 2008-08-28 08:29:11 +0000 (Thu, 28 Aug 2008)
New Revision: 22197
Modified:
branches/saltedhashstore/freenet/src/freenet/support/BinaryBloomFilter.java
branches/saltedhashstore/freenet/src/freenet/support/BloomFilter.java
branches/saltedhashstore/freenet/src/freenet/support/CountingBloomFilter.java
Log:
more bloom filter fix
Modified:
branches/saltedhashstore/freenet/src/freenet/support/BinaryBloomFilter.java
===================================================================
--- branches/saltedhashstore/freenet/src/freenet/support/BinaryBloomFilter.java
2008-08-28 02:23:34 UTC (rev 22196)
+++ branches/saltedhashstore/freenet/src/freenet/support/BinaryBloomFilter.java
2008-08-28 08:29:11 UTC (rev 22197)
@@ -21,7 +21,7 @@
*/
protected BinaryBloomFilter(int length, int k) {
super(length, k);
- filter = ByteBuffer.allocate(length / 8);
+ filter = ByteBuffer.allocate(this.length / 8);
}
/**
Modified: branches/saltedhashstore/freenet/src/freenet/support/BloomFilter.java
===================================================================
--- branches/saltedhashstore/freenet/src/freenet/support/BloomFilter.java
2008-08-28 02:23:34 UTC (rev 22196)
+++ branches/saltedhashstore/freenet/src/freenet/support/BloomFilter.java
2008-08-28 08:29:11 UTC (rev 22197)
@@ -19,6 +19,15 @@
protected ReadWriteLock lock = new ReentrantReadWriteLock();
+ public static BloomFilter createFilter(int length, int k, boolean
counting) {
+ if (k == 0 || length == 0)
+ return new NullBloomFilter(length, k);
+ if (counting)
+ return new CountingBloomFilter(length, k);
+ else
+ return new BinaryBloomFilter(length, k);
+ }
+
public static BloomFilter createFilter(File file, int length, int k,
boolean counting) throws IOException {
if (k == 0 || length == 0)
return new NullBloomFilter(length, k);
Modified:
branches/saltedhashstore/freenet/src/freenet/support/CountingBloomFilter.java
===================================================================
---
branches/saltedhashstore/freenet/src/freenet/support/CountingBloomFilter.java
2008-08-28 02:23:34 UTC (rev 22196)
+++
branches/saltedhashstore/freenet/src/freenet/support/CountingBloomFilter.java
2008-08-28 08:29:11 UTC (rev 22197)
@@ -21,7 +21,7 @@
*/
protected CountingBloomFilter(int length, int k) {
super(length, k);
- filter = ByteBuffer.allocate(length / 4);
+ filter = ByteBuffer.allocate(this.length / 4);
}
/**
