Author: nextgens
Date: 2008-05-03 02:56:09 +0000 (Sat, 03 May 2008)
New Revision: 19691
Modified:
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/PeerManager.java
Log:
revert r19589 and r19596
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2008-05-02 23:27:36 UTC
(rev 19690)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2008-05-03 02:56:09 UTC
(rev 19691)
@@ -728,7 +728,7 @@
return acks;
}
- public synchronized void requeueForgot(int[] forgotPackets, int start,
int length) {
+ public void requeueForgot(int[] forgotPackets, int start, int length) {
synchronized(forgottenQueue) { // It doesn't do anything else
does it? REDFLAG
for(int i=start;i<start+length;i++) {
queueForgotten(i, false);
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-05-02 23:27:36 UTC
(rev 19690)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-05-03 02:56:09 UTC
(rev 19691)
@@ -1008,7 +1008,6 @@
}
private void writePeersInner() {
- synchronized(this) {
synchronized(writePeersSync) {
if(darkFilename != null)
writePeersInner(darkFilename,
getDarknetPeers());
@@ -1019,7 +1018,6 @@
writePeersInner(om.getOldPeersFilename(),
om.getOldPeers());
}
}
- }
}
/**
