Update of /cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27544/src/freenet/node
Modified Files:
Version.java PublishHandlerSender.java
Log Message:
139 (mandatory):
Fix really dumb publish routing bug.
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/Version.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -w -r1.133 -r1.134
--- Version.java 20 Sep 2005 18:32:06 -0000 1.133
+++ Version.java 20 Sep 2005 18:51:32 -0000 1.134
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 138;
+ public static final int buildNumber = 139;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 136;
+ public static final int lastGoodBuild = 139;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
Index: PublishHandlerSender.java
===================================================================
RCS file:
/cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/PublishHandlerSender.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- PublishHandlerSender.java 15 Sep 2005 18:16:04 -0000 1.1
+++ PublishHandlerSender.java 20 Sep 2005 18:51:32 -0000 1.2
@@ -234,7 +234,7 @@
msg = null;
try {
- node.usm.waitFor(mf);
+ msg = node.usm.waitFor(mf);
} catch (DisconnectedException e3) {
Logger.error(this, "Disconnected from next: "+next+" while
waiting for completion on "+this);
continue; // can cause load multiplication, hence the
error; what else are we supposed to do though?
@@ -242,7 +242,7 @@
if(msg == null || msg.getSpec() == DMT.FNPRejectedOverload) {
// Timeout
- Logger.error(this, "Timeout waiting for completion of
"+this);
+ Logger.error(this, "Timeout waiting for completion of
"+this+" : "+msg);
// Propagate back to source; fatal
if(source != null) {
Message m = DMT.createFNPRejectedOverload(uid);
