echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blockfile: Add generics, part 4

Browse Source
This commit is contained in:
zzz
2016-04-20 13:08:42 +00:00
parent 0067c8d1bd
commit 436fee9200
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/src/net/i2p/client/naming/BlockfileNamingService.java
View File

@ -540,7 +540,7 @@ public class BlockfileNamingService extends DummyNamingService {
* @return removed object or null * @return removed object or null
* @throws RuntimeException * @throws RuntimeException
*/ */
private static Object removeEntry(SkipList<String, ?> sl, String key) { private static <V> V removeEntry(SkipList<String, V> sl, String key) {
return sl.remove(key); return sl.remove(key);
} }
@ -858,12 +858,12 @@ public class BlockfileNamingService extends DummyNamingService {
SkipList<String, DestEntry> sl = _bf.getIndex(listname, _stringSerializer, _destSerializer); SkipList<String, DestEntry> sl = _bf.getIndex(listname, _stringSerializer, _destSerializer);
if (sl == null) if (sl == null)
return false; return false;
Object removed = removeEntry(sl, key); DestEntry removed = removeEntry(sl, key);
boolean rv = removed != null; boolean rv = removed != null;
if (rv) { if (rv) {
removeCache(hostname); removeCache(hostname);
try { try {
removeReverseEntry(key, ((DestEntry)removed).dest); removeReverseEntry(key, removed.dest);
} catch (ClassCastException cce) { } catch (ClassCastException cce) {
_log.error("DB reverse remove error", cce); _log.error("DB reverse remove error", cce);
} }

4
core/java/src/net/metanotion/util/skiplist/SkipList.java
View File

@ -118,7 +118,7 @@ public class SkipList<K extends Comparable<? super K>, V> implements Flushable {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Object remove(K key) { public V remove(K key) {
if(key == null) { throw new NullPointerException(); } if(key == null) { throw new NullPointerException(); }
Object[] res = stack.remove(stack.levels.length - 1, key, this); Object[] res = stack.remove(stack.levels.length - 1, key, this);
if(res != null) { if(res != null) {
@ -132,7 +132,7 @@ public class SkipList<K extends Comparable<? super K>, V> implements Flushable {
stack.flush(); stack.flush();
} }
flush(); flush();
return res[0]; return (V) res[0];
} }
return null; return null;
} }