[freenet-CVS] freenet/src/freenet ConnectionHandler.java, 1.170, 1.171 PeerPacketMessage.java, 1.5, 1.6 Version.java, 1.418, 1.419

[Matthew Toseland]

Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv3258/src/freenet

Modified Files:
        ConnectionHandler.java PeerPacketMessage.java Version.java 
Log Message:
6226: Minor bugfixes
- Null out sentPacket after jobDone fails to prevent an error message.
- Prevent NPE killing OCM infolet
- Fix backoff delay problem in ConnectionOpener


Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- ConnectionHandler.java      9 Oct 2003 00:23:38 -0000       1.170
+++ ConnectionHandler.java      9 Oct 2003 00:52:11 -0000       1.171
@@ -1053,6 +1053,7 @@
                                else {
                                        sentPacket.jobDone(true, size, peer, null);
                                }
+                               sentPacket = null;
                                return;
                        }
                }

Index: PeerPacketMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerPacketMessage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PeerPacketMessage.java      8 Oct 2003 22:54:18 -0000       1.5
+++ PeerPacketMessage.java      9 Oct 2003 00:52:11 -0000       1.6
@@ -87,7 +87,7 @@
     }
     
     public long trailerLength() {
-       return raw.trailingFieldLength;
+       return msg.trailerLength();
     }
     
     public boolean isCloseMessage() {

Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- Version.java        9 Oct 2003 00:23:39 -0000       1.418
+++ Version.java        9 Oct 2003 00:52:11 -0000       1.419
@@ -18,7 +18,7 @@
     public static String protocolVersion = "1.46";
     
     /** The build number of the current revision */
-    public static final int buildNumber = 6225;
+    public static final int buildNumber = 6226;
     // 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