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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-08 16:43:14 +0000 (Fri, 08 Aug 2008)
New Revision: 21672

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
use autoboxing

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-08-08 15:00:20 UTC (rev 
21671)
+++ trunk/freenet/src/freenet/node/Node.java    2008-08-08 16:43:14 UTC (rev 
21672)
@@ -2072,16 +2072,14 @@
        }

        void addTransferringRequestHandler(long id) {
-               Long l = new Long(id);
                synchronized(transferringRequestHandlers) {
-                       transferringRequestHandlers.add(l);
+                       transferringRequestHandlers.add(id);
                }
        }

        void removeTransferringRequestHandler(long id) {
-               Long l = new Long(id);
                synchronized(transferringRequestHandlers) {
-                       transferringRequestHandlers.remove(l);
+                       transferringRequestHandlers.remove(id);
                }
        }

@@ -2416,9 +2414,8 @@
        }

        public boolean lockUID(long uid, boolean ssk, boolean insert, boolean 
offerReply, boolean local) {
-               Long l = new Long(uid);
                synchronized(runningUIDs) {
-                       if(!runningUIDs.add(l)) {
+                       if(!runningUIDs.add(uid)) {
                                // Already present.
                                return false;
                        }
@@ -2427,23 +2424,22 @@
                HashSet set = getUIDTracker(ssk, insert, offerReply, local);
                synchronized(set) {
                        if(logMINOR) Logger.minor(this, "Locking "+uid+" 
ssk="+ssk+" insert="+insert+" offerReply="+offerReply+" local="+local+" 
size="+set.size());
-                       set.add(l);
+                       set.add(uid);
                        if(logMINOR) Logger.minor(this, "Locked "+uid+" 
ssk="+ssk+" insert="+insert+" offerReply="+offerReply+" local="+local+" 
size="+set.size());
                }
                return true;
        }

        public void unlockUID(long uid, boolean ssk, boolean insert, boolean 
canFail, boolean offerReply, boolean local) {
-               Long l = new Long(uid);
                completed(uid);
                HashSet set = getUIDTracker(ssk, insert, offerReply, local);
                synchronized(set) {
                        if(logMINOR) Logger.minor(this, "Unlocking "+uid+" 
ssk="+ssk+" insert="+insert+" offerReply="+offerReply+", local="+local+" 
size="+set.size());
-                       set.remove(l);
+                       set.remove(uid);
                        if(logMINOR) Logger.minor(this, "Unlocked "+uid+" 
ssk="+ssk+" insert="+insert+" offerReply="+offerReply+", local="+local+" 
size="+set.size());
                }
                synchronized(runningUIDs) {
-                       if(!runningUIDs.remove(l) && !canFail)
+                       if(!runningUIDs.remove(uid) && !canFail)
                                throw new IllegalStateException("Could not 
unlock "+uid+ '!');
                }
        }
@@ -2626,7 +2622,7 @@
         */
        public boolean recentlyCompleted(long id) {
                synchronized (recentlyCompletedIDs) {
-                       return recentlyCompletedIDs.contains(new Long(id));
+                       return recentlyCompletedIDs.contains(id);
                }
        }

@@ -2635,7 +2631,7 @@
         */
        void completed(long id) {
                synchronized (recentlyCompletedIDs) {
-                       recentlyCompletedIDs.push(new Long(id));
+                       recentlyCompletedIDs.push(id);
                        while(recentlyCompletedIDs.size() > 
MAX_RECENTLY_COMPLETED_IDS)
                                recentlyCompletedIDs.pop();
                }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-08-08 15:00:20 UTC 
(rev 21671)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-08-08 16:43:14 UTC 
(rev 21672)
@@ -2985,9 +2985,9 @@
                synchronized(this) {
                        count = (Long) 
localNodeSentMessageTypes.get(messageSpecName);
                        if(count == null)
-                               count = new Long(1);
+                               count = 1L;
                        else
-                               count = new Long(count.longValue() + 1);
+                               count = count.longValue() + 1;
                        localNodeSentMessageTypes.put(messageSpecName, count);
                }
        }
@@ -3001,9 +3001,9 @@
                synchronized(localNodeReceivedMessageTypes) {
                        count = (Long) 
localNodeReceivedMessageTypes.get(messageSpecName);
                        if(count == null)
-                               count = new Long(1);
+                               count = 1L;
                        else
-                               count = new Long(count.longValue() + 1);
+                               count = count.longValue() + 1;
                        localNodeReceivedMessageTypes.put(messageSpecName, 
count);
                }
        }