Author: juiceman
Date: 2008-12-29 22:17:33 +0000 (Mon, 29 Dec 2008)
New Revision: 24830
Modified:
trunk/freenet/src/freenet/client/async/USKManager.java
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/io/comm/MessageFilter.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PacketSender.java
Log:
And Long.
For the curious, this is the message from FindBugs: Method invokes inefficient
Number constructor; use static valueOf instead
Using new Integer(int) is guaranteed to always result in a new object whereas
Integer.valueOf(int) allows caching of values to be done by the compiler, class
library, or JVM. Using of cached values avoids object allocation and the code
will be faster.
Values between -128 and 127 are guaranteed to have corresponding cached
instances and using valueOf is approximately 3.5 times faster than using
constructor. For values outside the constant range the performance of both
styles is the same.
Unless the class must be compatible with JVMs predating Java 1.5, use either
autoboxing or the valueOf() method when creating instances of Long, Integer,
Short, Character, and Byte.
Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java 2008-12-29
22:02:35 UTC (rev 24829)
+++ trunk/freenet/src/freenet/client/async/USKManager.java 2008-12-29
22:17:33 UTC (rev 24830)
@@ -144,7 +144,7 @@
Long l = (Long) latestVersionByClearUSK.get(clear);
if(logMINOR) Logger.minor(this, "Old value: "+l);
if((l == null) || (number > l.longValue())) {
- l = new Long(number);
+ l = Long.valueOf(number);
latestVersionByClearUSK.put(clear, l);
if(logMINOR) Logger.minor(this, "Put "+number);
} else return;
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-12-29 22:02:35 UTC (rev 24829)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-12-29 22:17:33 UTC (rev 24830)
@@ -843,7 +843,7 @@
String messageName = entry.getKey();
Long messageCount = entry.getValue();
messageNames.add(messageName);
- messageCounts.put(messageName, new Long[] {
messageCount, new Long(0) });
+ messageCounts.put(messageName, new Long[] {
messageCount, Long.valueOf(0) });
}
for (Map.Entry<String,Long> entry :
peerNodeStatus.getLocalMessagesSent().entrySet() ) {
String messageName = entry.getKey();
@@ -853,7 +853,7 @@
}
Long[] existingCounts = messageCounts.get(messageName);
if (existingCounts == null) {
- messageCounts.put(messageName, new Long[] { new
Long(0), messageCount });
+ messageCounts.put(messageName, new Long[] {
Long.valueOf(0), messageCount });
} else {
existingCounts[1] = messageCount;
}
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2008-12-29 22:02:35 UTC
(rev 24829)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2008-12-29 22:17:33 UTC
(rev 24830)
@@ -189,7 +189,7 @@
}
public void set(String key, long l) {
- set(key, new Long(l));
+ set(key, Long.valueOf(l));
}
public void set(String key, double d) {
Modified: trunk/freenet/src/freenet/io/comm/MessageFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageFilter.java 2008-12-29
22:02:35 UTC (rev 24829)
+++ trunk/freenet/src/freenet/io/comm/MessageFilter.java 2008-12-29
22:17:33 UTC (rev 24830)
@@ -147,7 +147,7 @@
}
public MessageFilter setField(String fieldName, long value) {
- return setField(fieldName, new Long(value));
+ return setField(fieldName, Long.valueOf(value));
}
public MessageFilter setField(String fieldName, Object fieldValue) {
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-12-29 22:02:35 UTC
(rev 24829)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-12-29 22:17:33 UTC
(rev 24830)
@@ -579,7 +579,7 @@
*/
private boolean handleRoutedRejected(Message m) {
long id = m.getLong(DMT.UID);
- Long lid = new Long(id);
+ Long lid = Long.valueOf(id);
RoutedContext rc = routedContexts.get(lid);
if(rc == null) {
// Gah
@@ -618,7 +618,7 @@
if(logMINOR) Logger.minor(this, "handleRouted("+m+ ')');
long id = m.getLong(DMT.UID);
- Long lid = new Long(id);
+ Long lid = Long.valueOf(id);
short htl = m.getShort(DMT.HTL);
byte[] identity = ((ShortBuffer)
m.getObject(DMT.NODE_IDENTITY)).getData();
if(source != null) htl = source.decrementHTL(htl);
@@ -661,7 +661,7 @@
boolean handleRoutedReply(Message m) {
long id = m.getLong(DMT.UID);
if(logMINOR) Logger.minor(this, "Got reply: "+m);
- Long lid = new Long(id);
+ Long lid = Long.valueOf(id);
RoutedContext ctx = routedContexts.get(lid);
if(ctx == null) {
Logger.error(this, "Unrecognized routed reply: "+m);
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-12-29 22:02:35 UTC
(rev 24829)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-12-29 22:17:33 UTC
(rev 24830)
@@ -573,7 +573,7 @@
Job job = new Job(name, runner);
if(offset < 0) offset = 0;
long now = System.currentTimeMillis();
- Long l = new Long(offset + now);
+ Long l = Long.valueOf(offset + now);
synchronized(timedJobsByTime) {
Object o = timedJobsByTime.get(l);
if(o == null)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs