[freenet-cvs] r19285 - in trunk/freenet/src/freenet/node: . useralerts

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-04-14 02:24:57 +0000 (Mon, 14 Apr 2008)
New Revision: 19285

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
Log:
findbugs: fix some harmless warning, dead store to local variable


Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-04-14 02:24:25 UTC 
(rev 19284)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-04-14 02:24:57 UTC 
(rev 19285)
@@ -546,7 +546,7 @@
                        Logger.error(this, "Extra peer data directory for peer 
not a directory: "+extraPeerDataPeerDir.getPath());
                        return -1;
                }
-               Integer[] localFileNumbers = null;
+               Integer[] localFileNumbers;
                int nextFileNumber = 0;
                synchronized(extraPeerDataFileNumbers) {
                        // Find the first free slot
@@ -635,7 +635,7 @@
                        Logger.error(this, "Extra peer data directory for peer 
not a directory: "+extraPeerDataPeerDir.getPath());
                        return;
                }
-               Integer[] localFileNumbers = null;
+               Integer[] localFileNumbers;
                synchronized(extraPeerDataFileNumbers) {
                        localFileNumbers = (Integer[]) 
extraPeerDataFileNumbers.toArray(new Integer[extraPeerDataFileNumbers.size()]);
                }
@@ -731,7 +731,7 @@
        public void sendQueuedN2NMs() {
                if(logMINOR)
                        Logger.minor(this, "Sending queued N2NMs for 
"+shortToString());
-               Integer[] localFileNumbers = null;
+               Integer[] localFileNumbers;
                synchronized(queuedToSendN2NMExtraPeerDataFileNumbers) {
                        localFileNumbers = (Integer[]) 
queuedToSendN2NMExtraPeerDataFileNumbers.toArray(new 
Integer[queuedToSendN2NMExtraPeerDataFileNumbers.size()]);
                }

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-04-14 
02:24:25 UTC (rev 19284)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-04-14 
02:24:57 UTC (rev 19285)
@@ -944,7 +944,7 @@
                }

                // sanity check
-               byte[] myNi = null;
+               byte[] myNi;
                synchronized (pn) {
                        myNi = (byte[]) pn.jfkNoncesSent.get(replyTo);
                }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-04-14 02:24:25 UTC 
(rev 19284)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-04-14 02:24:57 UTC 
(rev 19285)
@@ -817,7 +817,6 @@
                }
                if(logMINOR)
                        Logger.minor(this, "Updating handshake IPs for peer '" 
+ shortToString() + "' (" + ignoreHostnames + ')');
-               Peer[] localHandshakeIPs;
                Peer[] myNominalPeer;

                // Don't synchronize while doing lookups which may take a long 
time!
@@ -825,9 +824,9 @@
                        myNominalPeer = (Peer[]) nominalPeer.toArray(new 
Peer[nominalPeer.size()]);
                }

+               Peer[] localHandshakeIPs;
                if(myNominalPeer.length == 0) {
                        if(localDetectedPeer == null) {
-                               localHandshakeIPs = null;
                                synchronized(this) {
                                        handshakeIPs = null;
                                }

Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2008-04-14 02:24:25 UTC (rev 19284)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2008-04-14 02:24:57 UTC (rev 19285)
@@ -64,7 +64,7 @@
        }

        public UserAlert[] getAlerts() {
-               UserAlert[] a = null;
+               UserAlert[] a;
                synchronized (alerts) {
                        a = (UserAlert[]) alerts.toArray(new 
UserAlert[alerts.size()]);
                }