[freenet-cvs] r14186 - trunk/freenet/src/freenet/node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-07-18 23:58:49 +0000 (Wed, 18 Jul 2007)
New Revision: 14186

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Maybe fix the following npe:
java.lang.NullPointerException
        at 
freenet.node.fcp.FCPServer$FCPAllowedHostsCallback.get(FCPServer.java:254)
        at freenet.config.StringOption.getValue(StringOption.java:26)
        at freenet.config.StringOption.getValueString(StringOption.java:36)
        at freenet.config.SubConfig.exportFieldSet(SubConfig.java:224)
        at freenet.config.SubConfig.exportFieldSet(SubConfig.java:198)
        at 
freenet.clients.http.ConnectionsToadlet.handleGet(ConnectionsToadlet.java:448)
        at 
freenet.clients.http.ToadletContextImpl.handle(ToadletContextImpl.java:321)
        at 
freenet.clients.http.SimpleToadletServer$SocketHandler.run(SimpleToadletServer.java:432)


Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2007-07-18 23:32:23 UTC 
(rev 14185)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2007-07-18 23:58:49 UTC 
(rev 14186)
@@ -251,7 +251,8 @@
                }

                public String get() {
-                       return 
node.getFCPServer().networkInterface.getAllowedHosts();
+                       FCPServer server = node.getFCPServer(); 
+                       return (server == null ? "127.0.0.1,0:0:0:0:0:0:0:1" : 
server.networkInterface.getAllowedHosts());
                }

                public void set(String val) {
@@ -447,10 +448,6 @@
                return L10n.getString("FcpServer."+key, pattern, value);
        }

-       private static String l10n(String key, String[] patterns, String[] 
values) {
-               return L10n.getString("FcpServer."+key, patterns, values);
-       }
-
        public void setPersistentDownloadsEnabled(boolean set) {
                synchronized(persistenceSync) {
                        if(enablePersistentDownloads == set) return;