Permalink
Browse files

Merge branch 'mos-bt' into mos-bt-topo

Conflicts:
	src/scala/spark/BitTorrentBroadcast.scala
  • Loading branch information...
2 parents 4268ecf + 9b6d407 commit 0af35c621da0a73020deff2a3631a5149af431e1 Mosharaf Chowdhury committed Feb 5, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/scala/spark/BitTorrentBroadcast.scala
@@ -592,8 +592,8 @@ extends Broadcast[T] with Logging {
// Update the hasBlocksBitVector first
hasBlocksBitVector.synchronized {
hasBlocksBitVector.set (bcBlock.blockID)
+ hasBlocks += 1
}
- hasBlocks += 1
rxSpeeds.addDataPoint (peerToTalkTo, receptionTime)

0 comments on commit 0af35c6

Please sign in to comment.