Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv31219/src/freenet
Modified Files:
PeerHandler.java PeerPacketMessage.java Version.java
Log Message:
6254: fix FCP, broken by 6253
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- PeerHandler.java 17 Oct 2003 01:43:28 -0000 1.23
+++ PeerHandler.java 17 Oct 2003 02:35:47 -0000 1.24
@@ -524,6 +524,7 @@
boolean onlyGivenMsg)
throws IOException {
return getPacket(link, p, i,
+ m == null ? null :
new PeerPacketMessage(i, m, null,
NORMAL, this),
onlyGivenMsg);
}
Index: PeerPacketMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerPacketMessage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- PeerPacketMessage.java 15 Oct 2003 21:15:48 -0000 1.10
+++ PeerPacketMessage.java 17 Oct 2003 02:35:47 -0000 1.11
@@ -36,9 +36,11 @@
startTime = System.currentTimeMillis();
this.id = i;
this.msg = msg;
+ if(msg == null) throw new NullPointerException();
this.cb = cb;
this.priority = priority;
this.ph = ph;
+ if(ph == null) throw new NullPointerException();
}
/** Set the message up to send on a connection using a specific
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -w -r1.446 -r1.447
--- Version.java 17 Oct 2003 02:02:48 -0000 1.446
+++ Version.java 17 Oct 2003 02:35:47 -0000 1.447
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6253;
+ public static final int buildNumber = 6254;
// 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
