On Tue, Sep 2, 2008 at 1:31 AM, Matthew Toseland
<toad at amphibian.dyndns.org> wrote:
> On Monday 01 September 2008 08:16, j16sdiz at freenetproject.org wrote:
>> Author: j16sdiz
>> Date: 2008-09-01 07:16:36 +0000 (Mon, 01 Sep 2008)
>> New Revision: 22293
>>
>> Modified:
>> trunk/freenet/src/freenet/client/DefaultMIMETypes.java
>> trunk/freenet/src/freenet/client/FailureCodeTracker.java
>> trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
>> trunk/freenet/src/freenet/client/async/OfferedKeysList.java
>> trunk/freenet/src/freenet/node/DarknetPeerNode.java
>> trunk/freenet/src/freenet/node/SimpleSendableInsert.java
>> trunk/freenet/src/freenet/support/FileLoggerHook.java
>> trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
>> trunk/freenet/src/freenet/support/NumberedRecentItems.java
>> trunk/freenet/src/freenet/support/Serializer.java
>> trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
>> trunk/freenet/src/freenet/support/SortedVectorByNumber.java
>> trunk/freenet/test/freenet/support/HTMLNodeTest.java
>> trunk/freenet/test/freenet/support/LRUHashtableTest.java
>> Log:
>> javac warning hunt: generic and auto-boxing
>>
>> Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-01
> 03:48:27 UTC (rev 22292)
>> +++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-01
> 07:16:36 UTC (rev 22293)
>> @@ -58,10 +58,9 @@
>> final HashMap map = new HashMap();
>>
>> public synchronized void inc(int k) {
>> - Integer key = new Integer(k);
>> - Item i = (Item) map.get(key);
>> + Item i = (Item) map.get(k);
>> if(i == null)
>> - map.put(key, i = new Item());
>> + map.put(k, i = new Item());
>> i.x++;
>> total++;
>> }
>
> Will the JVM optimise this into a single instantiation of an Integer? If
it don't
> you're not 100% sure about this, then DON'T DO IT.
fixed in r22411
>>
>> Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-01
>> 03:48:27
> UTC (rev 22292)
>> +++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-01
>> 07:16:36
> UTC (rev 22293)
>> @@ -870,10 +870,9 @@
>> }
>>
>> protected void remove() {
>> - Long l = new Long(uid);
>> synchronized(DarknetPeerNode.this) {
>> - myFileOffersByUID.remove(l);
>> - hisFileOffersByUID.remove(l);
>> + myFileOffersByUID.remove(uid);
>> + hisFileOffersByUID.remove(uid);
>> }
>> data.close();
>> }
>
> Here too.
>
>> Modified: trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
> 2008-09-01 03:48:27 UTC (rev 22292)
>> +++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
> 2008-09-01 07:16:36 UTC (rev 22293)
>> @@ -108,10 +104,9 @@
>> minValue = index;
>> }
>> if(data == null) throw new NullPointerException();
>> - Integer i = new Integer(index);
>> - LimitedRangeIntByteArrayMapElement le =
> (LimitedRangeIntByteArrayMapElement) contents.get(i);
>> + LimitedRangeIntByteArrayMapElement le = contents.get(index);
>> if(le == null)
>> - contents.put(new Integer(index), new
> LimitedRangeIntByteArrayMapElement(index, data, callbacks, priority));
>> + contents.put(index, new
>> LimitedRangeIntByteArrayMapElement(index,
> data, callbacks, priority));
>> else
>> le.reput();
>> notifyAll();
>
> And here.
>
> _______________________________________________
> Devl mailing list
> Devl at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
>
