Author: toad
Date: 2008-11-13 19:34:01 +0000 (Thu, 13 Nov 2008)
New Revision: 23534
Added:
branches/db4o/freenet/src/org/apache/
branches/db4o/freenet/src/org/apache/tools/
branches/db4o/freenet/test/org/apache/
branches/db4o/freenet/test/org/apache/tools/
Removed:
branches/db4o/freenet/src/org/apache/tools/
branches/db4o/freenet/test/org/apache/tools/
Modified:
branches/db4o/freenet/src/freenet/io/AddressTracker.java
branches/db4o/freenet/src/freenet/node/Version.java
Log:
Merge unmerged changes from 22843 to 23166 (1167) into db4o branch.
Modified: branches/db4o/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- branches/db4o/freenet/src/freenet/io/AddressTracker.java 2008-11-13
18:55:49 UTC (rev 23533)
+++ branches/db4o/freenet/src/freenet/io/AddressTracker.java 2008-11-13
19:34:01 UTC (rev 23534)
@@ -105,7 +105,8 @@
timeDefinitelyNoPacketsReceived = System.currentTimeMillis();
timeDefinitelyNoPacketsSent =
fs.getLong("TimeDefinitelyNoPacketsSent");
peerTrackers = new HashMap();
- SimpleFieldSet peers = fs.getSubset("Peers");
+ SimpleFieldSet peers = fs.subset("Peers");
+ if(peers != null) {
Iterator i = peers.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
@@ -114,9 +115,11 @@
peerTrackers.put(item.peer, item);
}
}
+ }
ipTrackers = new HashMap();
- SimpleFieldSet ips = fs.getSubset("IPs");
- i = ips.directSubsetNameIterator();
+ SimpleFieldSet ips = fs.subset("IPs");
+ if(ips != null) {
+ Iterator i = ips.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
SimpleFieldSet peer = ips.subset((String)i.next());
@@ -124,6 +127,7 @@
ipTrackers.put(item.addr, item);
}
}
+ }
}
public void sentPacketTo(Peer peer) {
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 18:55:49 UTC
(rev 23533)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 19:34:01 UTC
(rev 23534)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1168;
+ private static final int buildNumber = 1166;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1165;
- private static final int newLastGoodBuild = 1168;
+ private static final int newLastGoodBuild = 1166;
static final long transitionTime;
static {
final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
// year, month - 1 (or constant), day, hour, minute, second
- _cal.set( 2008, Calendar.OCTOBER, 31, 0, 0, 0 );
+ _cal.set( 2008, Calendar.OCTOBER, 29, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
Copied: branches/db4o/freenet/src/org/apache (from rev 23117,
trunk/freenet/src/org/apache)
Copied: branches/db4o/freenet/src/org/apache/tools (from rev 23117,
trunk/freenet/src/org/apache/tools)
Copied: branches/db4o/freenet/test/org/apache (from rev 23117,
trunk/freenet/test/org/apache)
Copied: branches/db4o/freenet/test/org/apache/tools (from rev 23117,
trunk/freenet/test/org/apache/tools)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
