Changeset 25e7dea


Ignore:
Timestamp:
Nov 11, 2013 11:49:02 PM (6 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
df84a2f
Parents:
76078de (diff), 90919eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '4f6d64a50c7c5c27682914984831fc581724659d'

and 'e5def490e4eba793ca0d2bcb739771dcdf8c0242'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/util/ObjectCounter.java

    r76078de r25e7dea  
    11package net.i2p.util;
    22
     3import java.io.Serializable;
    34import java.util.Set;
    45import java.util.concurrent.ConcurrentHashMap;
     
    1011 *  @author zzz, welterde
    1112 */
    12 public class ObjectCounter<K> {
     13public class ObjectCounter<K> implements Serializable {
     14    /**
     15     * Serializable so it can be passed in an Android Bundle
     16     */
     17    private static final long serialVersionUID = 3160378641721937421L;
     18
    1319    private final ConcurrentHashMap<K, AtomicInteger> map;
    1420
Note: See TracChangeset for help on using the changeset viewer.