Author: toad
Date: 2009-01-22 18:45:22 +0000 (Thu, 22 Jan 2009)
New Revision: 25218
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/client/async/RequestCooldownQueue.java
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
branches/db4o/freenet/src/freenet/client/async/USKManager.java
Log:
Doh - merge up to 25205 (1203), rest of it!
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -29,7 +29,7 @@
final int maxRetries;
private int retryCount;
final FetchContext ctx;
- static final Object[] keys = new Object[] { new Integer(0) };
+ static final Object[] keys = new Object[] { Integer.valueOf(0) };
/** It is essential that we know when the cooldown will end, otherwise
we cannot
* remove the key from the queue if we are killed before that */
long cooldownWakeupTime;
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -42,7 +42,8 @@
/**
* @param client The object to call back when we complete, or don't.
- * @param data
+ * @param data The data to insert. This will not be freed by
ClientPutter, the callback must do that. However,
+ * buckets used internally by the client layer will be freed.
* @param targetURI
* @param cm
* @param ctx
Modified:
branches/db4o/freenet/src/freenet/client/async/RequestCooldownQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/RequestCooldownQueue.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/RequestCooldownQueue.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -202,8 +202,8 @@
if(cr instanceof ClientGetter) {
String shortURI =
((ClientGetter)cr).getURI().toShortString();
Integer ctr = (Integer)
countsByShortURI.get(shortURI);
- if(ctr == null) ctr = new Integer(1);
- else ctr = new Integer(ctr.intValue()+1);
+ if(ctr == null) ctr = Integer.valueOf(1);
+ else ctr = Integer.valueOf(ctr.intValue()+1);
countsByShortURI.put(shortURI, ctr);
} else {
notGetter++;
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -433,7 +433,7 @@
if(finished)
return new Object[] {};
else
- return new Object[] { new Integer(0) };
+ return new Object[] { Integer.valueOf(0) };
}
@Override
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -294,8 +294,13 @@
if(startedDecode) {
return;
} else {
+ boolean tooSmall = data.size() <
CHKBlock.DATA_LENGTH;
// Don't count the last data block, since we
can't use it in FEC decoding.
- if(!(ignoreLastDataBlock && blockNo ==
dataKeys.length - 1))
+ if(tooSmall && ((!ignoreLastDataBlock) ||
(blockNo != dataKeys.length - 1))) {
+ fail(new
FetchException(FetchException.INVALID_METADATA, "Block too small in splitfile:
block "+blockNo+" of "+dataKeys.length+" data keys, "+checkKeys.length+" check
keys"), container, context, true);
+ return;
+ }
+ if(!(ignoreLastDataBlock && blockNo ==
dataKeys.length - 1 && tooSmall))
fetchedBlocks++;
else
// This block is not going to be
fetched, and because of the insertion format.
@@ -1283,12 +1288,12 @@
for(int i=0;i<dataRetries.length;i++) {
if(dataKeys[i] == null) continue;
if(dataRetries[i] == retryCount)
- v.add(new Integer(i));
+ v.add(Integer.valueOf(i));
}
for(int i=0;i<checkRetries.length;i++) {
if(checkKeys[i] == null) continue;
if(checkRetries[i] == retryCount)
- v.add(new Integer(i+dataKeys.length));
+ v.add(Integer.valueOf(i+dataKeys.length));
}
return v.toArray(new Integer[v.size()]);
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-01-22 18:32:20 UTC (rev 25217)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -118,6 +118,9 @@
container.activate(this, 1);
container.activate(segment, 1);
}
+ // j16sdiz (22-DEC-2008):
+ // ClientRequestSchedular.removePendingKeys() call this to get
a list of request to be removed
+ // FIXME ClientRequestSchedular.removePendingKeys() is leaking,
what's missing here?
return segment.getKeyNumbersAtRetryLevel(retryCount);
}
@@ -575,7 +578,7 @@
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Adding block "+blockNo+" to
"+this+" dontSchedule="+dontSchedule);
if(blockNo < 0) throw new IllegalArgumentException();
- Integer i = new Integer(blockNo);
+ Integer i = Integer.valueOf(blockNo);
boolean schedule = true;
synchronized(segment) {
@@ -675,7 +678,7 @@
Logger.minor(this, "No block found for key "+key+" on
"+this);
return;
}
- Integer token = new Integer(blockNo);
+ Integer token = Integer.valueOf(blockNo);
ClientCHK ckey = (ClientCHK) segment.getBlockKey(blockNo,
container);
ClientCHKBlock cb;
try {
Modified: branches/db4o/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKManager.java
2009-01-22 18:32:20 UTC (rev 25217)
+++ branches/db4o/freenet/src/freenet/client/async/USKManager.java
2009-01-22 18:45:22 UTC (rev 25218)
@@ -152,7 +152,7 @@
Long l = (Long) latestVersionByClearUSK.get(clear);
if(logMINOR) Logger.minor(this, "Old value: "+l);
if((l == null) || (number > l.longValue())) {
- l = new Long(number);
+ l = Long.valueOf(number);
latestVersionByClearUSK.put(clear, l);
if(logMINOR) Logger.minor(this, "Put "+number);
} else return;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
