Author: toad
Date: 2008-11-14 23:10:05 +0000 (Fri, 14 Nov 2008)
New Revision: 23597
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PacketSender.java
Log:
Avoid NPEs in simulations that don't load the client layer
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-11-14
19:43:52 UTC (rev 23596)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-11-14
23:10:05 UTC (rev 23597)
@@ -2570,6 +2570,8 @@
peersWithProblems.add(tracker.pn.getPeer());
if(peersWithProblems.size() > 1) return;
}
+ if(node.clientCore == null || node.clientCore.alerts == null)
+ return;
node.clientCore.alerts.register(disconnectedStillNotAckedAlert);
}
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-11-14 19:43:52 UTC
(rev 23596)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-11-14 23:10:05 UTC
(rev 23597)
@@ -429,6 +429,8 @@
peersDumpedBlockedTooLong.add(p);
if(peersDumpedBlockedTooLong.size() > 1) return;
}
+ if(node.clientCore == null || node.clientCore.alerts == null)
+ return;
node.clientCore.alerts.register(peersDumpedBlockedTooLongAlert);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
