Author: toad
Date: 2008-11-29 20:39:52 +0000 (Sat, 29 Nov 2008)
New Revision: 23989
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/clients/http/WelcomeToadlet.java
branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
branches/db4o/freenet/src/freenet/node/Node.java
branches/db4o/freenet/src/freenet/node/NodeStarter.java
branches/db4o/freenet/src/freenet/node/PeerNode.java
branches/db4o/freenet/src/freenet/node/RequestHandler.java
branches/db4o/freenet/src/freenet/node/Version.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 1185
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-23907
+ /trunk/freenet:19964-23920
Modified: branches/db4o/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/WelcomeToadlet.java
2008-11-29 20:37:35 UTC (rev 23988)
+++ branches/db4o/freenet/src/freenet/clients/http/WelcomeToadlet.java
2008-11-29 20:39:52 UTC (rev 23989)
@@ -564,7 +564,8 @@
HTMLNode bookmarkBoxContent = bookmarkBox.addChild("div", "class",
"infobox-content");
// Search box
-
if(core.node.pluginManager.isPluginLoaded("plugins.XMLLibrarian.XMLLibrarian"))
{
+ if(core.node.pluginManager != null &&
+
core.node.pluginManager.isPluginLoaded("plugins.XMLLibrarian.XMLLibrarian")) {
HTMLNode form = bookmarkBoxContent.addChild("form", new
String[] { "method", "action" }, new String[] { "GET",
"/plugins/plugins.XMLLibrarian.XMLLibrarian" });
form.addChild("input", new String[] { "type", "name", "value"
}, new String[] { "hidden", "choice", "index" });
form.addChild("input", new String[] { "type", "size", "name" },
new String[] { "text", "80", "search" });
Modified: branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-11-29 20:37:35 UTC (rev 23988)
+++ branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-11-29 20:39:52 UTC (rev 23989)
@@ -2025,10 +2025,18 @@
KeyTracker kt = pn.getCurrentKeyTracker();
if(kt == null) {
Logger.error(this, "Not connected while sending
packets: "+pn);
+ if(!dontRequeue) {
+ for(MessageItem item : messages)
+ item.onDisconnect();
+ }
return false;
}
if(kt.wouldBlock(false)) {
if(logMINOR) Logger.minor(this, "Would block: "+kt);
+ // Requeue
+ if(!dontRequeue) {
+ pn.requeueMessageItems(messages, 0,
messages.length, false, "WouldBlock");
+ }
return false;
}
int length = 1;
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2008-11-29 20:37:35 UTC
(rev 23988)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2008-11-29 20:39:52 UTC
(rev 23989)
@@ -1868,7 +1868,8 @@
HTMLNode ul =
div.addChild("ul");
for (String type : new String[]
{ "chk", "pubkey", "ssk" })
- for (String storecache
: new String[] { "store", "store.key", "store.lru" }) {
+ for (String storecache
: new String[] { "store", "store.keys", "store.lru", "cache",
+ "cache.keys",
"cache.lru" }) {
File f = new
File(storeDir, type + suffix + "." + storecache);
if (f.exists())
ul.addChild("li", f.getAbsolutePath());
@@ -1887,7 +1888,8 @@
sb.append(L10n.getString("Node.storeSaltHashMigrated") + " \n");
for (String type : new String[]
{ "chk", "pubkey", "ssk" })
- for (String storecache
: new String[] { "store", "store.key", "store.lru" }) {
+ for (String storecache
: new String[] { "store", "store.keys", "store.lru", "cache",
+ "cache.keys",
"cache.lru" }) {
File f = new
File(storeDir, type + suffix + "." + storecache);
if (f.exists())
sb.append(" - ");
Modified: branches/db4o/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeStarter.java 2008-11-29
20:37:35 UTC (rev 23988)
+++ branches/db4o/freenet/src/freenet/node/NodeStarter.java 2008-11-29
20:39:52 UTC (rev 23989)
@@ -33,7 +33,7 @@
private Node node;
private static LoggingConfigHandler logConfigHandler;
- public final static int RECOMMENDED_EXT_BUILD_NUMBER = 25;
+ public final static int RECOMMENDED_EXT_BUILD_NUMBER = 26;
/*
(File.separatorChar == '\\') &&
(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
? 6 : 2;
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-29
20:37:35 UTC (rev 23988)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-29
20:39:52 UTC (rev 23989)
@@ -1162,6 +1162,8 @@
}
}
if(messagesTellDisconnected != null) {
+ if(logMINOR)
+ Logger.minor(this, "Messages to dump:
"+messagesTellDisconnected.length);
for(MessageItem mi : messagesTellDisconnected) {
mi.onDisconnect();
}
Modified: branches/db4o/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestHandler.java 2008-11-29
20:37:35 UTC (rev 23988)
+++ branches/db4o/freenet/src/freenet/node/RequestHandler.java 2008-11-29
20:39:52 UTC (rev 23989)
@@ -463,12 +463,15 @@
private boolean completed = false;
public void acknowledged() {
+ if(logMINOR)
+ Logger.minor(this, "Acknowledged terminal
message: " + RequestHandler.this);
//terminalMessage ack'd by remote peer
complete();
}
public void disconnected() {
- Logger.minor(this, "Peer disconnected before terminal
message sent for " + RequestHandler.this);
+ if(logMINOR)
+ Logger.minor(this, "Peer disconnected before
terminal message sent for " + RequestHandler.this);
complete();
}
@@ -478,6 +481,8 @@
}
public void sent() {
+ if(logMINOR)
+ Logger.minor(this, "Sent terminal message: " +
RequestHandler.this);
complete();
}
@@ -487,6 +492,8 @@
return;
completed = true;
}
+ if(logMINOR)
+ Logger.minor(this, "Completing: " +
RequestHandler.this);
//For byte counting, this relies on the fact that the
callback will only be excuted once.
applyByteCounts();
unregisterRequestHandlerWithNode();
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 20:37:35 UTC
(rev 23988)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 20:39:52 UTC
(rev 23989)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1184;
+ private static final int buildNumber = 1185;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1180;
- private static final int newLastGoodBuild = 1181;
+ private static final int oldLastGoodBuild = 1181;
+ private static final int newLastGoodBuild = 1185;
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.NOVEMBER, 23, 0, 0, 0 );
+ _cal.set( 2008, Calendar.DECEMBER, 1, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23907
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23920
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23907
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23920
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23907
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23920
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23907
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23920
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
