HCOLL-184 removed this as it was failing on teamcity - " if (!absolutePath.endsWith("Chronicle-Map"))

return null;
This commit is contained in:
Rob Austin
2014-12-17 19:53:13 +00:00
parent de22705272
commit a6926bfe4b
3 changed files with 35 additions and 3 deletions
@@ -34,14 +34,15 @@ class BuildVersion {
/**
* @return version of ChronicleMap being used, or NULL if its not known
*/
public static String version() {
public static String readVersion() {
// the best way to get the version is to read it from the manifest
final String version = getVersionFromManifest();
if (version != null)
return version;
// as a fall back for development we will read the version from the pom file
// as a fall back for development, we will read the version from the pom file
return getVersionFromPom();
}
@@ -80,6 +80,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
static final int MAX_ENTRY_OVERSIZE_FACTOR = 64;
private static final long serialVersionUID = 2L;
final Class<K> kClass;
final String mapVersion;
final SizeMarshaller keySizeMarshaller;
final BytesReader<K> originalKeyReader;
final KI originalKeyInterop;
@@ -128,6 +129,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
kClass = keyBuilder.eClass;
keySizeMarshaller = keyBuilder.sizeMarshaller();
originalKeyReader = keyBuilder.reader();
mapVersion = BuildVersion.readVersion();
originalKeyInterop = (KI) keyBuilder.interop();
@@ -181,6 +183,13 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
initTransients();
}
/**
* @return the version of Chronicle Map this instance was built with
*/
String version() {
return mapVersion;
}
final long segmentHash(long hash) {
return hashSplitting.segmentHash(hash);
}
@@ -3018,4 +3027,5 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
map, null, map.valueIdentity(), segmentHash, map, true);
}
}
}