* GeoIPv6: Fix NPE (ticket #992)

This commit is contained in:
zzz
2013-07-29 14:02:08 +00:00
parent 4340f70d72
commit 7737bf5212
3 changed files with 3 additions and 2 deletions

View File

@ -5,6 +5,7 @@
- New Hash384 and Hash512 classes
- Remove length field in SimpleDataStructure
- New SU3File generator/verifier/extractor
* GeoIPv6: Fix NPE (ticket #992)
2012-07-28 zzz
* Addresses: Treat RFC 4193 addresses fc00::/7 as local

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 14;
public final static long BUILD = 15;
/** for example "-test" */
public final static String EXTRA = "";

View File

@ -153,7 +153,7 @@ class GeoIP {
}
}
// IPv6
search = _pendingSearch.toArray(new Long[_pendingIPv6Search.size()]);
search = _pendingIPv6Search.toArray(new Long[_pendingIPv6Search.size()]);
_pendingIPv6Search.clear();
if (search.length > 0) {
Arrays.sort(search);