Author: toad
Date: 2008-02-06 19:08:35 +0000 (Wed, 06 Feb 2008)
New Revision: 17600
Modified:
trunk/freenet/src/freenet/node/FailureTableEntry.java
Log:
Delete unnecessary copy variables
Modified: trunk/freenet/src/freenet/node/FailureTableEntry.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-02-06
19:05:53 UTC (rev 17599)
+++ trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-02-06
19:08:35 UTC (rev 17600)
@@ -127,7 +127,6 @@
receivedTime = now;
boolean includedAlready = false;
int nulls = 0;
- PeerNode req = requestor;
int ret = -1;
for(int i=0;i<requestorNodes.length;i++) {
PeerNode got = requestorNodes[i] == null ? null :
(PeerNode) requestorNodes[i].get();
@@ -139,11 +138,11 @@
}
if(got == null)
nulls++;
- if(got == req) {
+ if(got == requestor) {
// Update existing entry
includedAlready = true;
requestorTimes[i] = now;
- requestorBootIDs[i] = req.getBootID();
+ requestorBootIDs[i] = requestor.getBootID();
ret = i;
break;
}
@@ -155,10 +154,9 @@
// Nice special case
for(int i=0;i<requestorNodes.length;i++) {
if(requestorNodes[i] == null ||
requestorNodes[i].get() == null) {
- PeerNode pn = requestor;
- requestorNodes[i] = pn.myRef;
+ requestorNodes[i] = requestor.myRef;
requestorTimes[i] = now;
- requestorBootIDs[i] = pn.getBootID();
+ requestorBootIDs[i] =
requestor.getBootID();
return i;
}
}
@@ -180,15 +178,11 @@
}
if(!includedAlready) {
-
- PeerNode pn = requestor;
- if(pn != null) {
- newRequestorNodes[toIndex] = pn.myRef;
+ newRequestorNodes[toIndex] = requestor.myRef;
newRequestorTimes[toIndex] = now;
- newRequestorBootIDs[toIndex] = pn.getBootID();
+ newRequestorBootIDs[toIndex] =
requestor.getBootID();
ret = toIndex;
toIndex++;
- }
}
for(int i=toIndex;i<newRequestorNodes.length;i++)
newRequestorNodes[i] = null;
@@ -215,17 +209,16 @@
sentTime = now;
boolean includedAlready = false;
int nulls = 0;
- PeerNode req = requestedFrom;
int ret = -1;
for(int i=0;i<requestedNodes.length;i++) {
PeerNode got = requestedNodes[i] == null ? null :
(PeerNode) requestedNodes[i].get();
if(got == null)
nulls++;
- if(got == req) {
+ if(got == requestedFrom) {
// Update existing entry
includedAlready = true;
- requestedLocs[i] = req.getLocation();
- requestedBootIDs[i] = req.getBootID();
+ requestedLocs[i] = requestedFrom.getLocation();
+ requestedBootIDs[i] = requestedFrom.getBootID();
requestedTimes[i] = now;
ret = i;
break;
@@ -238,9 +231,8 @@
// Nice special case
for(int i=0;i<requestedNodes.length;i++) {
if(requestedNodes[i] == null ||
requestedNodes[i].get() == null) {
- PeerNode pn = requestedFrom;
- requestedNodes[i] = pn.myRef;
- requestedLocs[i] = pn.getLocation();
+ requestedNodes[i] = requestedFrom.myRef;
+ requestedLocs[i] =
requestedFrom.getLocation();
requestedTimes[i] = now;
return ret;
}
@@ -265,14 +257,11 @@
}
if(!includedAlready) {
- PeerNode pn = requestedFrom;
- if(pn != null) {
- newRequestedNodes[toIndex] = pn.myRef;
+ newRequestedNodes[toIndex] =
requestedFrom.myRef;
newRequestedTimes[toIndex] = now;
- newRequestedBootIDs[toIndex] = pn.getBootID();
- newRequestedLocs[toIndex] = pn.getLocation();
+ newRequestedBootIDs[toIndex] =
requestedFrom.getBootID();
+ newRequestedLocs[toIndex] =
requestedFrom.getLocation();
toIndex++;
- }
}
for(int i=toIndex;i<newRequestedNodes.length;i++)
newRequestedNodes[i] = null;
