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

[toad at freenetproject.org]

Author: toad
Date: 2007-09-06 18:32:00 +0000 (Thu, 06 Sep 2007)
New Revision: 14990

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Fix an NPE if opennet is disabled

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java	2007-09-06 17:15:37 UTC (rev 14989)
+++ trunk/freenet/src/freenet/node/RequestSender.java	2007-09-06 18:32:00 UTC (rev 14990)
@@ -692,7 +692,8 @@
     	
 		OpennetManager om = node.getOpennet();
     	try {
-			if(om != null /* prevent race */ && !node.addNewOpennetNode(ref)) {
+			if(om == null || 
+					(om != null /* prevent race */ && !node.addNewOpennetNode(ref))) {
 				// If we don't want it let somebody else have it
 				synchronized(this) {
 					opennetNoderef = noderef;