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

[toad at freenetproject.org]

Author: toad
Date: 2008-03-01 23:11:34 +0000 (Sat, 01 Mar 2008)
New Revision: 18307

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Fix NullPointerException

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java	2008-03-01 23:02:30 UTC (rev 18306)
+++ trunk/freenet/src/freenet/node/RequestHandler.java	2008-03-01 23:11:34 UTC (rev 18307)
@@ -219,7 +219,7 @@
 		if (now > responseDeadline) {
 			// Offer the data if there is any.
 			node.failureTable.onFinalFailure(key, null, htl, -1, source);
-			PeerNode routedLast = rs.routedLast();
+			PeerNode routedLast = rs == null ? null : rs.routedLast();
 			Logger.error(this, "requestsender took too long to respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2, true)+"/"+rs.getStatusString()+") routed to "+(routedLast == null ? "null" : routedLast.shortToString())); 
 			applyByteCounts();
 			unregisterRequestHandlerWithNode();