forked from I2P_Developers/i2p.i2p
i2psnark: Fix IOOBE when stopping torrent that is allocating (ticket #2273)
more sync in PartialPiece
This commit is contained in:
@ -112,7 +112,7 @@ class PartialPiece implements Comparable<PartialPiece> {
|
||||
* as set by setDownloaded() or read().
|
||||
*/
|
||||
|
||||
public Request getRequest() {
|
||||
public synchronized Request getRequest() {
|
||||
return new Request(this, this.off, Math.min(this.pclen - this.off, PeerState.PARTSIZE));
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ class PartialPiece implements Comparable<PartialPiece> {
|
||||
/**
|
||||
* How many bytes are good - as set by setDownloaded() or read()
|
||||
*/
|
||||
public int getDownloaded() {
|
||||
public synchronized int getDownloaded() {
|
||||
return this.off;
|
||||
}
|
||||
|
||||
@ -141,7 +141,7 @@ class PartialPiece implements Comparable<PartialPiece> {
|
||||
* Any chunks after a 'hole' will be lost.
|
||||
* @since 0.9.1
|
||||
*/
|
||||
public void setDownloaded(int offset) {
|
||||
public synchronized void setDownloaded(int offset) {
|
||||
this.off = offset;
|
||||
}
|
||||
|
||||
|
@ -546,7 +546,7 @@ class PeerState implements DataLoader
|
||||
synchronized(pp) {
|
||||
int dl = pp.getDownloaded();
|
||||
if (req.off != dl)
|
||||
req = new Request(pp, dl, 1);
|
||||
req = new Request(pp, dl);
|
||||
}
|
||||
rv.add(req);
|
||||
}
|
||||
|
@ -52,6 +52,25 @@ class Request
|
||||
throw new IndexOutOfBoundsException("Illegal Request " + toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* Dummy Request for PeerState.returnPartialPieces().
|
||||
* len will be zero.
|
||||
*
|
||||
* @param piece Piece number requested.
|
||||
* @param off the offset in the array.
|
||||
* @since 0.9.36
|
||||
*/
|
||||
Request(PartialPiece piece, int off)
|
||||
{
|
||||
this.piece = piece;
|
||||
this.off = off;
|
||||
this.len = 0;
|
||||
|
||||
// Sanity check
|
||||
if (off < 0 || off > piece.getLength())
|
||||
throw new IndexOutOfBoundsException("Illegal Request " + toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 0.9.1
|
||||
*/
|
||||
|
Reference in New Issue
Block a user