[freenet-cvs] r18565 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-03-19 10:31:40 +0000 (Wed, 19 Mar 2008)
New Revision: 18565

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix NPE. Hopefully.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-03-18 22:49:37 UTC 
(rev 18564)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-03-19 10:31:40 UTC 
(rev 18565)
@@ -3129,11 +3129,14 @@
     private PacketThrottle _lastThrottle;

     public PacketThrottle getThrottle() {
-       // pn.getPeer() cannot be null as it has already connected.
        PacketThrottle newThrottle = null;
        PacketThrottle prevThrottle = null;
        synchronized(this) {
                Peer peer = getPeer();
+               if(peer == null) {
+                       // We haven't connected, prevent an NPE.
+                       return null;
+               }
                if(_lastThrottle != null) {
                        if(_lastThrottle.getPeer().equals(peer))
                                return _lastThrottle;