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

[sl...@freenetproject.org]

Author: sleon
Date: 2006-01-05 12:53:46 +0000 (Thu, 05 Jan 2006)
New Revision: 7750

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/TestnetStatusUploader.java
Log:
hope this will be fix for npe?
peers can be null and i added check for it in 
String Node.getStatus()

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-01-05 12:49:51 UTC (rev 
7749)
+++ trunk/freenet/src/freenet/node/Node.java    2006-01-05 12:53:46 UTC (rev 
7750)
@@ -935,7 +935,8 @@
      */
     public String getStatus() {
        StringBuffer sb = new StringBuffer();
-       sb.append(peers.getStatus());
+       if (peers != null)
+               sb.append(peers.getStatus());
        sb.append("\nInserts: ");
        int x = insertSenders.size();
        sb.append(x);

Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-01-05 
12:49:51 UTC (rev 7749)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-01-05 
12:53:46 UTC (rev 7750)
@@ -55,15 +55,14 @@
                        //thread loop

                        while(true){
-                               if ( node != null) {
-                                       client = new Socket("sleon.dyndns.org", 
23415);
+                       
+                               client = new Socket("sleon.dyndns.org", 23415);
+                               PrintStream output = new 
PrintStream(client.getOutputStream());
+                               output.println(node.getStatus());
+                               output.close();

-                                       PrintStream output = new 
PrintStream(client.getOutputStream());
-                                       output.println(node.getStatus());
-                                       output.close();
-       
-                                       client.close();
-                               }
+                               client.close();
+                               
                                try{
                                        Thread.sleep(updateInterval);