Author: nextgens
Date: 2009-01-11 15:06:13 +0000 (Sun, 11 Jan 2009)
New Revision: 25019

Modified:
   trunk/freenet/src/freenet/node/RequestTag.java
Log:
Fix a NPE reported by Cooo:
http://dark-code.bulix.org/ylmemk-69465?raw


Modified: trunk/freenet/src/freenet/node/RequestTag.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestTag.java      2009-01-10 22:45:14 UTC 
(rev 25018)
+++ trunk/freenet/src/freenet/node/RequestTag.java      2009-01-11 15:06:13 UTC 
(rev 25019)
@@ -58,13 +58,17 @@
                sb.append("Still present after 
").append(TimeUtil.formatTime(age()));
                sb.append(" : ").append(uid).append(" : start=").append(start);
                sb.append(" ssk=").append(isSSK).append(" from 
store=").append(servedFromDatastore);
-               RequestSender s = sender.get();
-               if(s == null) {
-                       sb.append(" sender=null");
+               if(sender == null) {
+                       sb.append(" sender hasn't been set!");
                } else {
-                       sb.append(" sender=").append(s);
-                       sb.append(" status=");
-                       sb.append(s.getStatusString());
+                       RequestSender s = sender.get();
+                       if(s == null) {
+                               sb.append(" sender=null");
+                       } else {
+                               sb.append(" sender=").append(s);
+                               sb.append(" status=");
+                               sb.append(s.getStatusString());
+                       }
                }
                sb.append(" finishedCode=").append(requestSenderFinishedCode);
                sb.append(" rejected=").append(rejected);

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to