Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv16346/src/freenet
Modified Files:
PeerHandler.java PeerPacket.java Version.java
Log Message:
6261: try to catch or prevent java.lang.IllegalArgumentException: trailers can only be
attached to the LAST message! reported.
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- PeerHandler.java 20 Oct 2003 12:53:24 -0000 1.30
+++ PeerHandler.java 20 Oct 2003 17:02:42 -0000 1.31
@@ -649,6 +649,10 @@
" messages with trailers",
Logger.DEBUG);
if(m != null) {
packetMessages.add(m);
+ m.resolve(p);
+ if(m.hasTrailer() ||
+ m.getLength() > maxPacketSize)
+ onlyGivenMsg = true;
}
if(!onlyGivenMsg) {
boolean msgsEmpty = false;
Index: PeerPacket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerPacket.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- PeerPacket.java 18 Oct 2003 18:55:21 -0000 1.11
+++ PeerPacket.java 20 Oct 2003 17:02:42 -0000 1.12
@@ -41,7 +41,7 @@
totalLength += m.getLength();
if(m.hasTrailer()) {
if(i != (msgs.length-1))
- throw new IllegalArgumentException("trailers can only be attached
to the LAST message!");
+ throw new IllegalArgumentException("trailers can only be attached
to the LAST message!: msg "+i+" of "+msgs.length+" ("+m+") has trailer");
hasTrailer = true;
}
if(m.msg.close)
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -w -r1.453 -r1.454
--- Version.java 20 Oct 2003 16:37:53 -0000 1.453
+++ Version.java 20 Oct 2003 17:02:42 -0000 1.454
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6260;
+ public static final int buildNumber = 6261;
// 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
