Author: toad
Date: 2008-11-29 19:09:18 +0000 (Sat, 29 Nov 2008)
New Revision: 23978
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
branches/db4o/freenet/src/freenet/support/BloomFilter.java
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
Log:
Merge 1173
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-23436
+ /trunk/freenet:19964-23439
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:06:36 UTC
(rev 23977)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:09:18 UTC
(rev 23978)
@@ -24,11 +24,11 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1172;
+ private static final int buildNumber = 1173;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1169;
- private static final int newLastGoodBuild = 1170;
+ private static final int oldLastGoodBuild = 1173;
+ private static final int newLastGoodBuild = 1173;
static final long transitionTime;
static {
Modified: branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-11-29 19:06:36 UTC (rev 23977)
+++ branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-11-29 19:09:18 UTC (rev 23978)
@@ -120,8 +120,10 @@
synchronized(this) {
if(logMINOR)
Logger.minor(this, "maybeUpdate: isFetching=" +
isFetching + ", isRunning=" + isRunning + ", availableVersion=" +
availableVersion);
- if(isFetching || (!isRunning))
+ if(!isRunning)
return;
+ if(isFetching && availableVersion == fetchingVersion)
+ return;
if(availableVersion <= fetchedVersion)
return;
fetchingVersion = availableVersion;
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
---
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-11-29 19:06:36 UTC (rev 23977)
+++
branches/db4o/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-11-29 19:09:18 UTC (rev 23978)
@@ -381,7 +381,7 @@
offers = nodesOfferedMainJar.toArray(new
PeerNode[nodesOfferedMainJar.size()]);
}
for(int i = 0; i < offers.length; i++) {
- if(offers[i].isConnected())
+ if(!offers[i].isConnected())
continue;
synchronized(this) {
if(nodesAskedSendMainJar.size() +
nodesSendingMainJar.size() >= MAX_NODES_SENDING_MAIN_JAR)
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23436
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23439
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23436
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23439
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23436
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23439
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23436
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23439
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
