Author: toad
Date: 2006-11-26 01:37:04 +0000 (Sun, 26 Nov 2006)
New Revision: 11050
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
No reason to throw and block processing of the message.
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-26
01:35:14 UTC (rev 11049)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-26
01:37:04 UTC (rev 11050)
@@ -850,11 +850,7 @@
if((seqNumber != -1) && tracker.alreadyReceived(seqNumber)) {
tracker.queueAck(seqNumber);
- try {
- tracker.pn.receivedPacket(false);
- } catch (NotConnectedException e) {
- Logger.normal(this, "Processing packet while
disconnected: "+e+" for "+tracker, e);
- }
+ tracker.pn.receivedPacket(false);
Logger.error(this, "Received packet twice ("+seqNumber+") from
"+tracker.pn.getPeer()+": "+seqNumber+" ("+TimeUtil.formatTime((long)
tracker.pn.pingAverage.currentValue(), 2, true)+" ping avg)");
return;
}
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2006-11-26 01:35:14 UTC
(rev 11049)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2006-11-26 01:37:04 UTC
(rev 11050)
@@ -360,12 +360,7 @@
public synchronized void receivedPacket(int seqNumber) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Received packet "+seqNumber);
- try {
- pn.receivedPacket(false);
- } catch (NotConnectedException e) {
- if(logMINOR) Logger.minor(this, "Ignoring, because
disconnected");
- return;
- }
+ pn.receivedPacket(false);
if(seqNumber == -1) return;
// FIXME delete this log statement
if(logMINOR) Logger.minor(this, "Still received packet: "+seqNumber);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-11-26 01:35:14 UTC
(rev 11049)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-11-26 01:37:04 UTC
(rev 11050)
@@ -1326,12 +1326,12 @@
* @param dontLog If true, don't log an error or throw an exception if we
are not connected. This
* can be used in handshaking when the connection hasn't been verified yet.
*/
- void receivedPacket(boolean dontLog) throws NotConnectedException {
+ void receivedPacket(boolean dontLog) {
synchronized(this) {
if((!isConnected) && (!dontLog)) {
if((unverifiedTracker == null) &&
(currentTracker == null)) {
Logger.error(this, "Received packet
while disconnected!: "+this, new Exception("error"));
- throw new NotConnectedException();
+ // Presumably caller can handle it.
} else {
if(logMINOR) Logger.minor(this,
"Received packet while disconnected on "+this+" - recently disconnected() ?");
}
@@ -1468,12 +1468,7 @@
" old: "+previousTracker+" unverified:
"+unverifiedTracker+" bootID: "+thisBootID+" getName(): "+getName());
// Received a packet
- try {
- receivedPacket(unverified);
- } catch (NotConnectedException e) {
- Logger.error(this, "Disconnected in completedHandshake
with "+this);
- return true; // i suppose
- }
+ receivedPacket(unverified);
if(newer || older || !isConnected())
node.peers.disconnected(this);
