Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv21093/src/freenet
Modified Files:
ConnectionHandler.java Version.java
Log Message:
6197: FCP fetches were broken in 6195/6. Fixed it. Also another FCP related bug.
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ConnectionHandler.java 18 Sep 2003 17:48:03 -0000 1.157
+++ ConnectionHandler.java 19 Sep 2003 02:20:21 -0000 1.158
@@ -1272,8 +1272,8 @@
TrailerWriteCallback cb)
throws UnknownTrailerSendIDException, TrailerSendFinishedException,
AlreadySendingTrailerChunkException, IOException {
synchronized(trailerSendLock) {
- if(finalized.state() || sendClosed.state())
- throw new IOException("Closed");
+ if(finalized.state())
+ throw new IOException("Closed:
"+finalized.state()+":"+this);
if(trailerSendID != id)
throw new UnknownTrailerSendIDException();
if(trailerSentBytes >= trailerSendLength) {
@@ -2482,18 +2482,21 @@
//waitForOneSender();
// if we were just waiting for the connection
to become free..
if(m == null) return null;
- if (raw.close) {
-// needToRemoveFromOCM = true;
+ if(raw.close) {
+ //needToRemoveFromOCM = true;
+ logDEBUG("Closing because message says
so");
sendClosed.change(true);
//} else if (raw.sustain) {
// persist.change(true);
// hm, we only want to persist if we
*receive*
// a sustain message, right?
+ // sendingCount = 1 - it will get
closed after it finishes
}
if(logDEBUG) logDEBUG(sendingCount + "
messages in sendqueue");
if(logDEBUG) logDEBUG("Sending RawMessage: " +
raw, true);
+ lastSizeDone = 0;
// WATCHME
if (Main.watchme != null) {
logWatchme(m, raw);
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- Version.java 18 Sep 2003 18:02:45 -0000 1.389
+++ Version.java 19 Sep 2003 02:20:22 -0000 1.390
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6196;
+ public static final int buildNumber = 6197;
// 6028: may 3; ARK retrieval fix
public static final int ignoreBuildsAfter = 6500;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
