Author: j16sdiz
Date: 2008-08-22 08:57:03 +0000 (Fri, 22 Aug 2008)
New Revision: 22091
Modified:
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/freenet/support/io/BucketTools.java
trunk/freenet/test/freenet/support/MultiValueTableTest.java
Log:
use auto-boxing
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2008-08-22 08:56:29 UTC
(rev 22090)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2008-08-22 08:57:03 UTC
(rev 22091)
@@ -220,7 +220,6 @@
* Constraint: urgentTime is always greater than activeTime.
*/
long activeTime;
- final Integer packetNumberAsInteger;
void sent() throws UpdatableSortedLinkedListKilledException {
long now = System.currentTimeMillis();
@@ -232,7 +231,6 @@
BaseQueuedResend(int packetNumber) {
this.packetNumber = packetNumber;
- packetNumberAsInteger = new Integer(packetNumber);
long now = System.currentTimeMillis();
activeTime = initialActiveTime(now);
urgentTime = activeTime + urgentDelay();
@@ -278,7 +276,7 @@
}
public Object indexValue() {
- return packetNumberAsInteger;
+ return packetNumber;
}
private DoublyLinkedList parent;
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-08-22 08:56:29 UTC
(rev 22090)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-08-22 08:57:03 UTC
(rev 22091)
@@ -246,7 +246,6 @@
Message origMessage;
PeerNode pn;
long uid;
- Long luid;
RecentlyForwardedItem item;
IncomingSwapRequestHandler(Message msg, PeerNode pn,
RecentlyForwardedItem item) {
@@ -254,7 +253,6 @@
this.pn = pn;
this.item = item;
uid = origMessage.getLong(DMT.UID);
- luid = new Long(uid);
}
public void run() {
@@ -855,9 +853,8 @@
* to be handled otherwise.
*/
public boolean handleSwapRequest(Message m, PeerNode pn) {
- long oldID = m.getLong(DMT.UID);
- Long luid = new Long(oldID);
- long newID = oldID+1;
+ final long oldID = m.getLong(DMT.UID);
+ final long newID = oldID + 1;
/**
* UID is used to record the state i.e. UID x, came in from node a,
forwarded to node b.
* We increment it on each hop, because in order for the node
selection to be as random as
@@ -865,7 +862,7 @@
* twice or more. However, if we get a request with either the
incoming or the outgoing
* UID, we can safely kill it as it's clearly the result of a bug.
*/
- RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
+ RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(oldID);
if(item != null) {
if(logMINOR) Logger.minor(this, "Rejecting - same ID as
previous request");
// Reject
@@ -1012,8 +1009,8 @@
private RecentlyForwardedItem addForwardedItem(long uid, long oid,
PeerNode pn, PeerNode randomPeer) {
RecentlyForwardedItem item = new RecentlyForwardedItem(uid, oid, pn,
randomPeer);
synchronized(recentlyForwardedIDs) {
- recentlyForwardedIDs.put(new Long(uid), item);
- recentlyForwardedIDs.put(new Long(oid), item);
+ recentlyForwardedIDs.put(uid, item);
+ recentlyForwardedIDs.put(oid, item);
}
return item;
}
@@ -1023,9 +1020,8 @@
* @return True if we recognized and forwarded this reply.
*/
public boolean handleSwapReply(Message m, PeerNode source) {
- long uid = m.getLong(DMT.UID);
- Long luid = new Long(uid);
- RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
+ final long uid = m.getLong(DMT.UID);
+ RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(uid);
if(item == null) {
Logger.error(this, "Unrecognized SwapReply: ID "+uid);
return false;
@@ -1060,9 +1056,8 @@
* @return True if we recognized and forwarded this message.
*/
public boolean handleSwapRejected(Message m, PeerNode source) {
- long uid = m.getLong(DMT.UID);
- Long luid = new Long(uid);
- RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
+ final long uid = m.getLong(DMT.UID);
+ RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(uid);
if(item == null) return false;
if(item.requestSender == null){
if(logMINOR) Logger.minor(this, "Got a FNPSwapRejected without
any requestSender set! we can't and won't claim it! UID="+uid);
@@ -1095,9 +1090,8 @@
* @return True if we recognized and forwarded this message.
*/
public boolean handleSwapCommit(Message m, PeerNode source) {
- long uid = m.getLong(DMT.UID);
- Long luid = new Long(uid);
- RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
+ final long uid = m.getLong(DMT.UID);
+ RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(uid);
if(item == null) return false;
if(item.routedTo == null) return false;
if(source != item.requestSender) {
@@ -1123,10 +1117,9 @@
* @return True if we recognized and forwarded this message.
*/
public boolean handleSwapComplete(Message m, PeerNode source) {
- long uid = m.getLong(DMT.UID);
+ final long uid = m.getLong(DMT.UID);
if(logMINOR) Logger.minor(this, "handleSwapComplete("+uid+ ')');
- Long luid = new Long(uid);
- RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
+ RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(uid);
if(item == null) {
if(logMINOR) Logger.minor(this, "Item not found: "+uid+": "+m);
return false;
@@ -1277,8 +1270,8 @@
Logger.error(this, "removeRecentlyForwardedItem(null)", new
Exception("error"));
}
synchronized(recentlyForwardedIDs) {
- recentlyForwardedIDs.remove(new Long(item.incomingID));
- recentlyForwardedIDs.remove(new Long(item.outgoingID));
+ recentlyForwardedIDs.remove(item.incomingID);
+ recentlyForwardedIDs.remove(item.outgoingID);
}
}
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-08-22
08:56:29 UTC (rev 22090)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-08-22
08:57:03 UTC (rev 22091)
@@ -497,7 +497,7 @@
maybeQuickShrink(true);
return;
}
- Integer blockNum = new
Integer((int)storeBlock.offset);
+ Integer blockNum = (int) storeBlock.offset;
//Long seqNum = new
Long(storeBlock.recentlyUsed);
//System.out.println("#"+x+" seq "+seqNum+":
block "+blockNum);
if(blockNum.longValue() >= realSize) {
Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java 2008-08-22
08:56:29 UTC (rev 22090)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java 2008-08-22
08:57:03 UTC (rev 22091)
@@ -141,31 +141,31 @@
}
public final static int[] nullIndices(Bucket[] array) {
- List list = new ArrayList();
+ List<Integer> list = new ArrayList();
for (int i = 0; i < array.length; i++) {
if (array[i] == null) {
- list.add(new Integer(i));
+ list.add(i);
}
}
int[] ret = new int[list.size()];
for (int i = 0; i < list.size(); i++) {
- ret[i] = ((Integer) list.get(i)).intValue();
+ ret[i] = list.get(i);
}
return ret;
}
public final static int[] nonNullIndices(Bucket[] array) {
- List list = new ArrayList();
+ List<Integer> list = new ArrayList();
for (int i = 0; i < array.length; i++) {
if (array[i] != null) {
- list.add(new Integer(i));
+ list.add(i);
}
}
int[] ret = new int[list.size()];
for (int i = 0; i < list.size(); i++) {
- ret[i] = ((Integer) list.get(i)).intValue();
+ ret[i] = list.get(i);
}
return ret;
}
Modified: trunk/freenet/test/freenet/support/MultiValueTableTest.java
===================================================================
--- trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-08-22
08:56:29 UTC (rev 22090)
+++ trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-08-22
08:57:03 UTC (rev 22091)
@@ -15,12 +15,12 @@
*/
package freenet.support;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
-import java.util.Arrays;
import junit.framework.TestCase;
@@ -51,7 +51,7 @@
for (int i=0; i<sampleObjects.length;i++) {
if (isRandom)
methodValuesNumber =
1+rnd.nextInt(valuesNumber);
- sampleObjects[i][0] = new Integer(i);
+ sampleObjects[i][0] = i;
sampleObjects[i][1] =
fillSampleValuesList(methodValuesNumber); }
return sampleObjects;
}
