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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-30 17:06:14 +0000 (Wed, 30 Apr 2008)
New Revision: 19630

Modified:
   trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
Log:
Fix rare NPE

Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2008-04-30 16:58:33 UTC (rev 19629)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2008-04-30 17:06:14 UTC (rev 19630)
@@ -198,10 +198,14 @@
                        return NetworkInterface.DEFAULT_BIND_TO;
                }

-               public void set(String val) {
+               public void set(String val) throws InvalidConfigValueException {
                        if (!val.equals(get())) {
-                               
core.getTextModeClientInterface().networkInterface.setAllowedHosts(val);
-                               core.getTextModeClientInterface().allowedHosts 
= val;
+                               TextModeClientInterfaceServer server = 
core.getTextModeClientInterface();
+                               if(server != null) {
+                                       
server.networkInterface.setAllowedHosts(val);
+                                       server.allowedHosts = val;
+                               } else
+                                       throw new 
InvalidConfigValueException("Setting allowedHosts for TMCI (console) server 
when TMCI is disabled");
                        }
                }