[freenet-cvs] r11526 - in trunk/freenet/src/freenet/node: . fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-12-29 19:20:07 +0000 (Fri, 29 Dec 2006)
New Revision: 11526

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Some not yet tested code trying to address the error above... NOT TESTED!

INFO   | jvm 1    | 2006/12/29 08:39:57 | java.lang.NullPointerException
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.FCPConnectionOutputHandler.queue(FCPConnectionOutputHandler.java:66)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.ClientGet.trySendDataFoundOrGetFailed(ClientGet.java:375)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.ClientGet.sendPendingMessages(ClientGet.java:415)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.FCPClient.queuePendingMessagesOnConnectionRestart(FCPClient.java:128)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.FCPClient.setWatchGlobal(FCPClient.java:216)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.WatchGlobal.run(WatchGlobal.java:42)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.FCPConnectionInputHandler.realRun(FCPConnectionInputHandler.java:88)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
freenet.node.fcp.FCPConnectionInputHandler.run(FCPConnectionInputHandler.java:29)
INFO   | jvm 1    | 2006/12/29 08:39:57 |       at 
java.lang.Thread.run(Thread.java:595)

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-12-29 12:11:00 UTC (rev 
11525)
+++ trunk/freenet/src/freenet/node/Node.java    2006-12-29 19:20:07 UTC (rev 
11526)
@@ -37,7 +37,6 @@
 import com.sleepycat.je.EnvironmentMutableConfig;

 import freenet.client.FetcherContext;
-import freenet.config.Config;
 import freenet.config.FreenetFilePersistentConfig;
 import freenet.config.InvalidConfigValueException;
 import freenet.config.PersistentConfig;

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-12-29 12:11:00 UTC 
(rev 11525)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-12-29 19:20:07 UTC 
(rev 11526)
@@ -149,10 +149,14 @@
                        } catch (Throwable t) {
                                Logger.error(this, "Caught "+t, t);
                        }
+                       try{
+                               Thread.sleep(2000);
+                       }catch (InterruptedException e) {}
                }
        }

        private void realRun() throws IOException {
+               if(!node.isHasStarted()) return;
                // Accept a connection
                Socket s = networkInterface.accept();
                FCPConnectionHandler ch = new FCPConnectionHandler(s, this);