r26999 - in trunk/freenet/src/freenet: client/async clients/http support
[email protected] Sat, 18 Apr 2009 17:15:12 +0000
| Newsgroups | gmane.network.freenet.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: juiceman
Date: 2009-04-18 17:15:11 +0000 (Sat, 18 Apr 2009)
New Revision: 26999
Modified:
trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/support/HTMLEntities.java
trunk/freenet/src/freenet/support/PrioritizedSerialExecutor.java
Log:
Use valueOf(). It's up to 3.5x faster on Java 1.5+
Modified: trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -114,7 +114,7 @@
public void run(ObjectContainer container, ClientContext context) {
Query query = container.query();
query.constrain(BackgroundBlockEncoderTag.class);
- query.descend("nodeDBHandle").constrain(new Long(context.nodeDBHandle));
+ query.descend("nodeDBHandle").constrain(Long.valueOf(context.nodeDBHandle));
query.descend("priority").orderAscending();
query.descend("addedTime").orderAscending();
ObjectSet results = query.execute();
Modified: trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -101,7 +101,7 @@
long tStart = System.currentTimeMillis();
Query query = container.query();
query.constrain(PersistentCooldownQueueItem.class);
- query.descend("time").constrain(new Long(now)).smaller()
+ query.descend("time").constrain(Long.valueOf(now)).smaller()
.and(query.descend("parent").constrain(this).identity());
ObjectSet results = query.execute();
if(results.hasNext()) {
@@ -135,7 +135,7 @@
return v.toArray(new Key[v.size()]);
} else {
query = container.query();
- query.descend("time").orderAscending().constrain(new Long(now + dontCareAfterMillis)).smaller().
+ query.descend("time").orderAscending().constrain(Long.valueOf(now + dontCareAfterMillis)).smaller().
and(query.descend("parent").constrain(this).identity());
results = query.execute();
if(results.hasNext()) {
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -499,7 +499,7 @@
throw new IllegalStateException("Adding blocks to already cancelled "+this);
for(int x=0;x<blocks.length;x++) {
int i = blocks[x];
- Integer ii = new Integer(i);
+ Integer ii = Integer.valueOf(i);
if(blockNums.contains(ii)) {
if(!dontComplainOnDupes)
Logger.error(this, "Block numbers already contain block "+i);
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -1080,7 +1080,7 @@
checkFailed[checkNum] = true;
blocksCompleted++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
if(checkBlocks[checkNum] != null) {
if(persistent) container.activate(checkBlocks[checkNum], 1);
@@ -1103,7 +1103,7 @@
blocksCompleted++;
blocksSucceeded++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
if(checkBlocks[checkNum] != null) {
if(persistent) container.activate(checkBlocks[checkNum], 1);
@@ -1144,7 +1144,7 @@
dataFailed[blockNum] = true;
blocksCompleted++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
if(dataBlocks[blockNum] != null) {
if(persistent) container.activate(dataBlocks[blockNum], 1);
@@ -1167,7 +1167,7 @@
blocksCompleted++;
blocksSucceeded++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
if(dataBlocks[blockNum] != null && encoded) {
if(persistent) container.activate(dataBlocks[blockNum], 1);
@@ -1222,7 +1222,7 @@
blocksCompleted++;
blocksSucceeded++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
} else {
if(checkFailed[checkNum])
@@ -1247,7 +1247,7 @@
blocksCompleted++;
blocksSucceeded++;
if(persistent) container.activate(blocks, 2);
- blocks.remove(new Integer(blockNum));
+ blocks.remove(Integer.valueOf(blockNum));
if(persistent) container.store(blocks);
} else {
if(dataFailed[blockNum])
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -567,7 +567,7 @@
PeerAdditionReturnCodes result=addNewNode(nodesToAdd[i].trim().concat("\nEnd"), privateComment);
//Store the result
if(results.containsKey(result)==false){
- results.put(result, new Integer(0));
+ results.put(result, Integer.valueOf(0));
}
results.put(result, results.get(result)+1);
}
Modified: trunk/freenet/src/freenet/support/HTMLEntities.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLEntities.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/support/HTMLEntities.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -35,276 +35,276 @@
public static final HashMap<String, Character> decodeMap;
private static final Object[][] charArray = {
- {new Character((char)0), "#0"},
- {new Character((char)34), "quot"},
- {new Character((char)38), "amp"},
- {new Character((char)39), "#39"},
- {new Character((char)60), "lt"},
- {new Character((char)62), "gt"},
- {new Character((char)160), "nbsp"},
- {new Character((char)161), "iexcl"},
- {new Character((char)162), "cent"},
- {new Character((char)163), "pound"},
- {new Character((char)164), "curren"},
- {new Character((char)165), "yen"},
- {new Character((char)166), "brvbar"},
- {new Character((char)167), "sect"},
- {new Character((char)168), "uml"},
- {new Character((char)169), "copy"},
- {new Character((char)170), "ordf"},
- {new Character((char)171), "laquo"},
- {new Character((char)172), "not"},
- {new Character((char)173), "shy"},
- {new Character((char)174), "reg"},
- {new Character((char)175), "macr"},
- {new Character((char)176), "deg"},
- {new Character((char)177), "plusmn"},
- {new Character((char)178), "sup2"},
- {new Character((char)179), "sup3"},
- {new Character((char)180), "acute"},
- {new Character((char)181), "micro"},
- {new Character((char)182), "para"},
- {new Character((char)183), "middot"},
- {new Character((char)184), "cedil"},
- {new Character((char)185), "sup1"},
- {new Character((char)186), "ordm"},
- {new Character((char)187), "raquo"},
- {new Character((char)188), "frac14"},
- {new Character((char)189), "frac12"},
- {new Character((char)190), "frac34"},
- {new Character((char)191), "iquest"},
- {new Character((char)192), "Agrave"},
- {new Character((char)193), "Aacute"},
- {new Character((char)194), "Acirc"},
- {new Character((char)195), "Atilde"},
- {new Character((char)196), "Auml"},
- {new Character((char)197), "Aring"},
- {new Character((char)198), "AElig"},
- {new Character((char)199), "Ccedil"},
- {new Character((char)200), "Egrave"},
- {new Character((char)201), "Eacute"},
- {new Character((char)202), "Ecirc"},
- {new Character((char)203), "Euml"},
- {new Character((char)204), "Igrave"},
- {new Character((char)205), "Iacute"},
- {new Character((char)206), "Icirc"},
- {new Character((char)207), "Iuml"},
- {new Character((char)208), "ETH"},
- {new Character((char)209), "Ntilde"},
- {new Character((char)210), "Ograve"},
- {new Character((char)211), "Oacute"},
- {new Character((char)212), "Ocirc"},
- {new Character((char)213), "Otilde"},
- {new Character((char)214), "Ouml"},
- {new Character((char)215), "times"},
- {new Character((char)216), "Oslash"},
- {new Character((char)217), "Ugrave"},
- {new Character((char)218), "Uacute"},
- {new Character((char)219), "Ucirc"},
- {new Character((char)220), "Uuml"},
- {new Character((char)221), "Yacute"},
- {new Character((char)222), "THORN"},
- {new Character((char)223), "szlig"},
- {new Character((char)224), "agrave"},
- {new Character((char)225), "aacute"},
- {new Character((char)226), "acirc"},
- {new Character((char)227), "atilde"},
- {new Character((char)228), "auml"},
- {new Character((char)229), "aring"},
- {new Character((char)230), "aelig"},
- {new Character((char)231), "ccedil"},
- {new Character((char)232), "egrave"},
- {new Character((char)233), "eacute"},
- {new Character((char)234), "ecirc"},
- {new Character((char)235), "euml"},
- {new Character((char)236), "igrave"},
- {new Character((char)237), "iacute"},
- {new Character((char)238), "icirc"},
- {new Character((char)239), "iuml"},
- {new Character((char)240), "eth"},
- {new Character((char)241), "ntilde"},
- {new Character((char)242), "ograve"},
- {new Character((char)243), "oacute"},
- {new Character((char)244), "ocirc"},
- {new Character((char)245), "otilde"},
- {new Character((char)246), "ouml"},
- {new Character((char)247), "divide"},
- {new Character((char)248), "oslash"},
- {new Character((char)249), "ugrave"},
- {new Character((char)250), "uacute"},
- {new Character((char)251), "ucirc"},
- {new Character((char)252), "uuml"},
- {new Character((char)253), "yacute"},
- {new Character((char)254), "thorn"},
- {new Character((char)255), "yuml"},
- {new Character((char)260), "#260"},
- {new Character((char)261), "#261"},
- {new Character((char)262), "#262"},
- {new Character((char)263), "#263"},
- {new Character((char)280), "#280"},
- {new Character((char)281), "#281"},
- {new Character((char)321), "#321"},
- {new Character((char)322), "#322"},
- {new Character((char)323), "#323"},
- {new Character((char)324), "#324"},
- {new Character((char)338), "OElig"},
- {new Character((char)339), "oelig"},
- {new Character((char)346), "#346"},
- {new Character((char)347), "#347"},
- {new Character((char)352), "Scaron"},
- {new Character((char)353), "scaron"},
- {new Character((char)376), "Yuml"},
- {new Character((char)377), "#377"},
- {new Character((char)378), "#378"},
- {new Character((char)379), "#379"},
- {new Character((char)380), "#380"},
- {new Character((char)402), "fnof"},
- {new Character((char)710), "circ"},
- {new Character((char)732), "tilde"},
- {new Character((char)913), "Alpha"},
- {new Character((char)914), "Beta"},
- {new Character((char)915), "Gamma"},
- {new Character((char)916), "Delta"},
- {new Character((char)917), "Epsilon"},
- {new Character((char)918), "Zeta"},
- {new Character((char)919), "Eta"},
- {new Character((char)920), "Theta"},
- {new Character((char)921), "Iota"},
- {new Character((char)922), "Kappa"},
- {new Character((char)923), "Lambda"},
- {new Character((char)924), "Mu"},
- {new Character((char)925), "Nu"},
- {new Character((char)926), "Xi"},
- {new Character((char)927), "Omicron"},
- {new Character((char)928), "Pi"},
- {new Character((char)929), "Rho"},
- {new Character((char)931), "Sigma"},
- {new Character((char)932), "Tau"},
- {new Character((char)933), "Upsilon"},
- {new Character((char)934), "Phi"},
- {new Character((char)935), "Chi"},
- {new Character((char)936), "Psi"},
- {new Character((char)937), "Omega"},
- {new Character((char)945), "alpha"},
- {new Character((char)946), "beta"},
- {new Character((char)947), "gamma"},
- {new Character((char)948), "delta"},
- {new Character((char)949), "epsilon"},
- {new Character((char)950), "zeta"},
- {new Character((char)951), "eta"},
- {new Character((char)952), "theta"},
- {new Character((char)953), "iota"},
- {new Character((char)954), "kappa"},
- {new Character((char)955), "lambda"},
- {new Character((char)956), "mu"},
- {new Character((char)957), "nu"},
- {new Character((char)958), "xi"},
- {new Character((char)959), "omicron"},
- {new Character((char)960), "pi"},
- {new Character((char)961), "rho"},
- {new Character((char)962), "sigmaf"},
- {new Character((char)963), "sigma"},
- {new Character((char)964), "tau"},
- {new Character((char)965), "upsilon"},
- {new Character((char)966), "phi"},
- {new Character((char)967), "chi"},
- {new Character((char)968), "psi"},
- {new Character((char)969), "omega"},
- {new Character((char)977), "thetasym"},
- {new Character((char)978), "upsih"},
- {new Character((char)982), "piv"},
- {new Character((char)8194), "ensp"},
- {new Character((char)8195), "emsp"},
- {new Character((char)8201), "thinsp"},
- {new Character((char)8204), "zwnj"},
- {new Character((char)8205), "zwj"},
- {new Character((char)8206), "lrm"},
- {new Character((char)8207), "rlm"},
- {new Character((char)8211), "ndash"},
- {new Character((char)8212), "mdash"},
- {new Character((char)8216), "lsquo"},
- {new Character((char)8217), "rsquo"},
- {new Character((char)8218), "sbquo"},
- {new Character((char)8220), "ldquo"},
- {new Character((char)8221), "rdquo"},
- {new Character((char)8222), "bdquo"},
- {new Character((char)8224), "dagger"},
- {new Character((char)8225), "Dagger"},
- {new Character((char)8226), "bull"},
- {new Character((char)8230), "hellip"},
- {new Character((char)8240), "permil"},
- {new Character((char)8242), "prime"},
- {new Character((char)8243), "Prime"},
- {new Character((char)8249), "lsaquo"},
- {new Character((char)8250), "rsaquo"},
- {new Character((char)8254), "oline"},
- {new Character((char)8260), "frasl"},
- {new Character((char)8364), "euro"},
- {new Character((char)8465), "image"},
- {new Character((char)8472), "weierp"},
- {new Character((char)8476), "real"},
- {new Character((char)8482), "trade"},
- {new Character((char)8501), "alefsym"},
- {new Character((char)8592), "larr"},
- {new Character((char)8593), "uarr"},
- {new Character((char)8594), "rarr"},
- {new Character((char)8595), "darr"},
- {new Character((char)8596), "harr"},
- {new Character((char)8629), "crarr"},
- {new Character((char)8656), "lArr"},
- {new Character((char)8657), "uArr"},
- {new Character((char)8658), "rArr"},
- {new Character((char)8659), "dArr"},
- {new Character((char)8660), "hArr"},
- {new Character((char)8704), "forall"},
- {new Character((char)8706), "part"},
- {new Character((char)8707), "exist"},
- {new Character((char)8709), "empty"},
- {new Character((char)8711), "nabla"},
- {new Character((char)8712), "isin"},
- {new Character((char)8713), "notin"},
- {new Character((char)8715), "ni"},
- {new Character((char)8719), "prod"},
- {new Character((char)8721), "sum"},
- {new Character((char)8722), "minus"},
- {new Character((char)8727), "lowast"},
- {new Character((char)8730), "radic"},
- {new Character((char)8733), "prop"},
- {new Character((char)8734), "infin"},
- {new Character((char)8736), "ang"},
- {new Character((char)8743), "and"},
- {new Character((char)8744), "or"},
- {new Character((char)8745), "cap"},
- {new Character((char)8746), "cup"},
- {new Character((char)8747), "int"},
- {new Character((char)8756), "there4"},
- {new Character((char)8764), "sim"},
- {new Character((char)8773), "cong"},
- {new Character((char)8776), "asymp"},
- {new Character((char)8800), "ne"},
- {new Character((char)8801), "equiv"},
- {new Character((char)8804), "le"},
- {new Character((char)8805), "ge"},
- {new Character((char)8834), "sub"},
- {new Character((char)8835), "sup"},
- {new Character((char)8836), "nsub"},
- {new Character((char)8838), "sube"},
- {new Character((char)8839), "supe"},
- {new Character((char)8853), "oplus"},
- {new Character((char)8855), "otimes"},
- {new Character((char)8869), "perp"},
- {new Character((char)8901), "sdot"},
- {new Character((char)8968), "lceil"},
- {new Character((char)8969), "rceil"},
- {new Character((char)8970), "lfloor"},
- {new Character((char)8971), "rfloor"},
- {new Character((char)9001), "lang"},
- {new Character((char)9002), "rang"},
- {new Character((char)9674), "loz"},
- {new Character((char)9824), "spades"},
- {new Character((char)9827), "clubs"},
- {new Character((char)9829), "hearts"},
- {new Character((char)9830), "diams"}
+ {Character.valueOf((char)0), "#0"},
+ {Character.valueOf((char)34), "quot"},
+ {Character.valueOf((char)38), "amp"},
+ {Character.valueOf((char)39), "#39"},
+ {Character.valueOf((char)60), "lt"},
+ {Character.valueOf((char)62), "gt"},
+ {Character.valueOf((char)160), "nbsp"},
+ {Character.valueOf((char)161), "iexcl"},
+ {Character.valueOf((char)162), "cent"},
+ {Character.valueOf((char)163), "pound"},
+ {Character.valueOf((char)164), "curren"},
+ {Character.valueOf((char)165), "yen"},
+ {Character.valueOf((char)166), "brvbar"},
+ {Character.valueOf((char)167), "sect"},
+ {Character.valueOf((char)168), "uml"},
+ {Character.valueOf((char)169), "copy"},
+ {Character.valueOf((char)170), "ordf"},
+ {Character.valueOf((char)171), "laquo"},
+ {Character.valueOf((char)172), "not"},
+ {Character.valueOf((char)173), "shy"},
+ {Character.valueOf((char)174), "reg"},
+ {Character.valueOf((char)175), "macr"},
+ {Character.valueOf((char)176), "deg"},
+ {Character.valueOf((char)177), "plusmn"},
+ {Character.valueOf((char)178), "sup2"},
+ {Character.valueOf((char)179), "sup3"},
+ {Character.valueOf((char)180), "acute"},
+ {Character.valueOf((char)181), "micro"},
+ {Character.valueOf((char)182), "para"},
+ {Character.valueOf((char)183), "middot"},
+ {Character.valueOf((char)184), "cedil"},
+ {Character.valueOf((char)185), "sup1"},
+ {Character.valueOf((char)186), "ordm"},
+ {Character.valueOf((char)187), "raquo"},
+ {Character.valueOf((char)188), "frac14"},
+ {Character.valueOf((char)189), "frac12"},
+ {Character.valueOf((char)190), "frac34"},
+ {Character.valueOf((char)191), "iquest"},
+ {Character.valueOf((char)192), "Agrave"},
+ {Character.valueOf((char)193), "Aacute"},
+ {Character.valueOf((char)194), "Acirc"},
+ {Character.valueOf((char)195), "Atilde"},
+ {Character.valueOf((char)196), "Auml"},
+ {Character.valueOf((char)197), "Aring"},
+ {Character.valueOf((char)198), "AElig"},
+ {Character.valueOf((char)199), "Ccedil"},
+ {Character.valueOf((char)200), "Egrave"},
+ {Character.valueOf((char)201), "Eacute"},
+ {Character.valueOf((char)202), "Ecirc"},
+ {Character.valueOf((char)203), "Euml"},
+ {Character.valueOf((char)204), "Igrave"},
+ {Character.valueOf((char)205), "Iacute"},
+ {Character.valueOf((char)206), "Icirc"},
+ {Character.valueOf((char)207), "Iuml"},
+ {Character.valueOf((char)208), "ETH"},
+ {Character.valueOf((char)209), "Ntilde"},
+ {Character.valueOf((char)210), "Ograve"},
+ {Character.valueOf((char)211), "Oacute"},
+ {Character.valueOf((char)212), "Ocirc"},
+ {Character.valueOf((char)213), "Otilde"},
+ {Character.valueOf((char)214), "Ouml"},
+ {Character.valueOf((char)215), "times"},
+ {Character.valueOf((char)216), "Oslash"},
+ {Character.valueOf((char)217), "Ugrave"},
+ {Character.valueOf((char)218), "Uacute"},
+ {Character.valueOf((char)219), "Ucirc"},
+ {Character.valueOf((char)220), "Uuml"},
+ {Character.valueOf((char)221), "Yacute"},
+ {Character.valueOf((char)222), "THORN"},
+ {Character.valueOf((char)223), "szlig"},
+ {Character.valueOf((char)224), "agrave"},
+ {Character.valueOf((char)225), "aacute"},
+ {Character.valueOf((char)226), "acirc"},
+ {Character.valueOf((char)227), "atilde"},
+ {Character.valueOf((char)228), "auml"},
+ {Character.valueOf((char)229), "aring"},
+ {Character.valueOf((char)230), "aelig"},
+ {Character.valueOf((char)231), "ccedil"},
+ {Character.valueOf((char)232), "egrave"},
+ {Character.valueOf((char)233), "eacute"},
+ {Character.valueOf((char)234), "ecirc"},
+ {Character.valueOf((char)235), "euml"},
+ {Character.valueOf((char)236), "igrave"},
+ {Character.valueOf((char)237), "iacute"},
+ {Character.valueOf((char)238), "icirc"},
+ {Character.valueOf((char)239), "iuml"},
+ {Character.valueOf((char)240), "eth"},
+ {Character.valueOf((char)241), "ntilde"},
+ {Character.valueOf((char)242), "ograve"},
+ {Character.valueOf((char)243), "oacute"},
+ {Character.valueOf((char)244), "ocirc"},
+ {Character.valueOf((char)245), "otilde"},
+ {Character.valueOf((char)246), "ouml"},
+ {Character.valueOf((char)247), "divide"},
+ {Character.valueOf((char)248), "oslash"},
+ {Character.valueOf((char)249), "ugrave"},
+ {Character.valueOf((char)250), "uacute"},
+ {Character.valueOf((char)251), "ucirc"},
+ {Character.valueOf((char)252), "uuml"},
+ {Character.valueOf((char)253), "yacute"},
+ {Character.valueOf((char)254), "thorn"},
+ {Character.valueOf((char)255), "yuml"},
+ {Character.valueOf((char)260), "#260"},
+ {Character.valueOf((char)261), "#261"},
+ {Character.valueOf((char)262), "#262"},
+ {Character.valueOf((char)263), "#263"},
+ {Character.valueOf((char)280), "#280"},
+ {Character.valueOf((char)281), "#281"},
+ {Character.valueOf((char)321), "#321"},
+ {Character.valueOf((char)322), "#322"},
+ {Character.valueOf((char)323), "#323"},
+ {Character.valueOf((char)324), "#324"},
+ {Character.valueOf((char)338), "OElig"},
+ {Character.valueOf((char)339), "oelig"},
+ {Character.valueOf((char)346), "#346"},
+ {Character.valueOf((char)347), "#347"},
+ {Character.valueOf((char)352), "Scaron"},
+ {Character.valueOf((char)353), "scaron"},
+ {Character.valueOf((char)376), "Yuml"},
+ {Character.valueOf((char)377), "#377"},
+ {Character.valueOf((char)378), "#378"},
+ {Character.valueOf((char)379), "#379"},
+ {Character.valueOf((char)380), "#380"},
+ {Character.valueOf((char)402), "fnof"},
+ {Character.valueOf((char)710), "circ"},
+ {Character.valueOf((char)732), "tilde"},
+ {Character.valueOf((char)913), "Alpha"},
+ {Character.valueOf((char)914), "Beta"},
+ {Character.valueOf((char)915), "Gamma"},
+ {Character.valueOf((char)916), "Delta"},
+ {Character.valueOf((char)917), "Epsilon"},
+ {Character.valueOf((char)918), "Zeta"},
+ {Character.valueOf((char)919), "Eta"},
+ {Character.valueOf((char)920), "Theta"},
+ {Character.valueOf((char)921), "Iota"},
+ {Character.valueOf((char)922), "Kappa"},
+ {Character.valueOf((char)923), "Lambda"},
+ {Character.valueOf((char)924), "Mu"},
+ {Character.valueOf((char)925), "Nu"},
+ {Character.valueOf((char)926), "Xi"},
+ {Character.valueOf((char)927), "Omicron"},
+ {Character.valueOf((char)928), "Pi"},
+ {Character.valueOf((char)929), "Rho"},
+ {Character.valueOf((char)931), "Sigma"},
+ {Character.valueOf((char)932), "Tau"},
+ {Character.valueOf((char)933), "Upsilon"},
+ {Character.valueOf((char)934), "Phi"},
+ {Character.valueOf((char)935), "Chi"},
+ {Character.valueOf((char)936), "Psi"},
+ {Character.valueOf((char)937), "Omega"},
+ {Character.valueOf((char)945), "alpha"},
+ {Character.valueOf((char)946), "beta"},
+ {Character.valueOf((char)947), "gamma"},
+ {Character.valueOf((char)948), "delta"},
+ {Character.valueOf((char)949), "epsilon"},
+ {Character.valueOf((char)950), "zeta"},
+ {Character.valueOf((char)951), "eta"},
+ {Character.valueOf((char)952), "theta"},
+ {Character.valueOf((char)953), "iota"},
+ {Character.valueOf((char)954), "kappa"},
+ {Character.valueOf((char)955), "lambda"},
+ {Character.valueOf((char)956), "mu"},
+ {Character.valueOf((char)957), "nu"},
+ {Character.valueOf((char)958), "xi"},
+ {Character.valueOf((char)959), "omicron"},
+ {Character.valueOf((char)960), "pi"},
+ {Character.valueOf((char)961), "rho"},
+ {Character.valueOf((char)962), "sigmaf"},
+ {Character.valueOf((char)963), "sigma"},
+ {Character.valueOf((char)964), "tau"},
+ {Character.valueOf((char)965), "upsilon"},
+ {Character.valueOf((char)966), "phi"},
+ {Character.valueOf((char)967), "chi"},
+ {Character.valueOf((char)968), "psi"},
+ {Character.valueOf((char)969), "omega"},
+ {Character.valueOf((char)977), "thetasym"},
+ {Character.valueOf((char)978), "upsih"},
+ {Character.valueOf((char)982), "piv"},
+ {Character.valueOf((char)8194), "ensp"},
+ {Character.valueOf((char)8195), "emsp"},
+ {Character.valueOf((char)8201), "thinsp"},
+ {Character.valueOf((char)8204), "zwnj"},
+ {Character.valueOf((char)8205), "zwj"},
+ {Character.valueOf((char)8206), "lrm"},
+ {Character.valueOf((char)8207), "rlm"},
+ {Character.valueOf((char)8211), "ndash"},
+ {Character.valueOf((char)8212), "mdash"},
+ {Character.valueOf((char)8216), "lsquo"},
+ {Character.valueOf((char)8217), "rsquo"},
+ {Character.valueOf((char)8218), "sbquo"},
+ {Character.valueOf((char)8220), "ldquo"},
+ {Character.valueOf((char)8221), "rdquo"},
+ {Character.valueOf((char)8222), "bdquo"},
+ {Character.valueOf((char)8224), "dagger"},
+ {Character.valueOf((char)8225), "Dagger"},
+ {Character.valueOf((char)8226), "bull"},
+ {Character.valueOf((char)8230), "hellip"},
+ {Character.valueOf((char)8240), "permil"},
+ {Character.valueOf((char)8242), "prime"},
+ {Character.valueOf((char)8243), "Prime"},
+ {Character.valueOf((char)8249), "lsaquo"},
+ {Character.valueOf((char)8250), "rsaquo"},
+ {Character.valueOf((char)8254), "oline"},
+ {Character.valueOf((char)8260), "frasl"},
+ {Character.valueOf((char)8364), "euro"},
+ {Character.valueOf((char)8465), "image"},
+ {Character.valueOf((char)8472), "weierp"},
+ {Character.valueOf((char)8476), "real"},
+ {Character.valueOf((char)8482), "trade"},
+ {Character.valueOf((char)8501), "alefsym"},
+ {Character.valueOf((char)8592), "larr"},
+ {Character.valueOf((char)8593), "uarr"},
+ {Character.valueOf((char)8594), "rarr"},
+ {Character.valueOf((char)8595), "darr"},
+ {Character.valueOf((char)8596), "harr"},
+ {Character.valueOf((char)8629), "crarr"},
+ {Character.valueOf((char)8656), "lArr"},
+ {Character.valueOf((char)8657), "uArr"},
+ {Character.valueOf((char)8658), "rArr"},
+ {Character.valueOf((char)8659), "dArr"},
+ {Character.valueOf((char)8660), "hArr"},
+ {Character.valueOf((char)8704), "forall"},
+ {Character.valueOf((char)8706), "part"},
+ {Character.valueOf((char)8707), "exist"},
+ {Character.valueOf((char)8709), "empty"},
+ {Character.valueOf((char)8711), "nabla"},
+ {Character.valueOf((char)8712), "isin"},
+ {Character.valueOf((char)8713), "notin"},
+ {Character.valueOf((char)8715), "ni"},
+ {Character.valueOf((char)8719), "prod"},
+ {Character.valueOf((char)8721), "sum"},
+ {Character.valueOf((char)8722), "minus"},
+ {Character.valueOf((char)8727), "lowast"},
+ {Character.valueOf((char)8730), "radic"},
+ {Character.valueOf((char)8733), "prop"},
+ {Character.valueOf((char)8734), "infin"},
+ {Character.valueOf((char)8736), "ang"},
+ {Character.valueOf((char)8743), "and"},
+ {Character.valueOf((char)8744), "or"},
+ {Character.valueOf((char)8745), "cap"},
+ {Character.valueOf((char)8746), "cup"},
+ {Character.valueOf((char)8747), "int"},
+ {Character.valueOf((char)8756), "there4"},
+ {Character.valueOf((char)8764), "sim"},
+ {Character.valueOf((char)8773), "cong"},
+ {Character.valueOf((char)8776), "asymp"},
+ {Character.valueOf((char)8800), "ne"},
+ {Character.valueOf((char)8801), "equiv"},
+ {Character.valueOf((char)8804), "le"},
+ {Character.valueOf((char)8805), "ge"},
+ {Character.valueOf((char)8834), "sub"},
+ {Character.valueOf((char)8835), "sup"},
+ {Character.valueOf((char)8836), "nsub"},
+ {Character.valueOf((char)8838), "sube"},
+ {Character.valueOf((char)8839), "supe"},
+ {Character.valueOf((char)8853), "oplus"},
+ {Character.valueOf((char)8855), "otimes"},
+ {Character.valueOf((char)8869), "perp"},
+ {Character.valueOf((char)8901), "sdot"},
+ {Character.valueOf((char)8968), "lceil"},
+ {Character.valueOf((char)8969), "rceil"},
+ {Character.valueOf((char)8970), "lfloor"},
+ {Character.valueOf((char)8971), "rfloor"},
+ {Character.valueOf((char)9001), "lang"},
+ {Character.valueOf((char)9002), "rang"},
+ {Character.valueOf((char)9674), "loz"},
+ {Character.valueOf((char)9824), "spades"},
+ {Character.valueOf((char)9827), "clubs"},
+ {Character.valueOf((char)9829), "hearts"},
+ {Character.valueOf((char)9830), "diams"}
};
Modified: trunk/freenet/src/freenet/support/PrioritizedSerialExecutor.java
===================================================================
--- trunk/freenet/src/freenet/support/PrioritizedSerialExecutor.java 2009-04-18 17:11:05 UTC (rev 26998)
+++ trunk/freenet/src/freenet/support/PrioritizedSerialExecutor.java 2009-04-18 17:15:11 UTC (rev 26999)
@@ -89,9 +89,9 @@
name = name.substring(0, name.indexOf('@'));
Long l = timeByJobClasses.get(name);
if(l != null) {
- l = new Long(l.longValue() + (end-start));
+ l = Long.valueOf(l.longValue() + (end-start));
} else {
- l = new Long(end-start);
+ l = Long.valueOf(end-start);
}
timeByJobClasses.put(name, l);
if(logMINOR) {