[freenet-cvs] r12175 - in trunk/freenet/src/freenet: crypt node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-17 12:59:18 +0000 (Sat, 17 Mar 2007)
New Revision: 12175

Modified:
   trunk/freenet/src/freenet/crypt/DSAGroup.java
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Add a few assertions, simplify the non-working code

Modified: trunk/freenet/src/freenet/crypt/DSAGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroup.java       2007-03-17 12:27:39 UTC 
(rev 12174)
+++ trunk/freenet/src/freenet/crypt/DSAGroup.java       2007-03-17 12:59:18 UTC 
(rev 12175)
@@ -185,6 +185,8 @@
             qg = new QG(r);
             qg.start();
         }
+        
+        assert(qg != null);

         do {
             if ((cc++) % 15 == 0) System.err.print(".");

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-03-17 12:27:39 UTC 
(rev 12174)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-03-17 12:59:18 UTC 
(rev 12175)
@@ -118,20 +118,21 @@
        private boolean innerDetect(Vector addresses, boolean addedValidIP) {
                boolean setMaybeSymmetric = false;
                InetAddress[] detectedAddrs = ipDetector.getAddress();
+               assert(detectedAddrs != null);
                synchronized(this) {
                        hasDetectedIAD = true;
                }
-               if(detectedAddrs != null) {
-                       for(int i=0;i<detectedAddrs.length;i++) {
-                               Peer p = new Peer(detectedAddrs[i], 
node.portNumber);
-                               if(!addresses.contains(p)) {
-                                       Logger.normal(this, "Detected IP 
address: "+p);
-                                       addresses.add(p);
-                                       
if(p.getFreenetAddress().isRealInternetAddress(false, false))
-                                               addedValidIP = true;
-                               }
+               
+               for(int i=0;i<detectedAddrs.length;i++) {
+                       Peer p = new Peer(detectedAddrs[i], node.portNumber);
+                       if(!addresses.contains(p)) {
+                               Logger.normal(this, "Detected IP address: "+p);
+                               addresses.add(p);
+                               
if(p.getFreenetAddress().isRealInternetAddress(false, false))
+                                       addedValidIP = true;
                        }
                }
+               
                if((pluginDetectedIPs != null) && (pluginDetectedIPs.length > 
0)) {
                        for(int i=0;i<pluginDetectedIPs.length;i++) {
                                InetAddress addr = 
pluginDetectedIPs[i].publicAddress;