Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

HCOLL-222 added failing test - map.put() throwing and NPE when putting a LongValue$$Native

Browse Source
This commit is contained in:
Rob Austin
2014-11-28 11:34:55 +00:00
parent 68c66d1094
commit e69d204c90
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
+2 -4
View File
@@ -143,9 +143,8 @@ abstract class AbstractChannelReplicator implements Closeable {
* @param selector
* @return
*/
private Selector openSelector(@NotNull final Selector selector, @NotNull final
SelectedSelectionKeySet
selectedKeySet) {
private Selector openSelector(@NotNull final Selector selector,
@NotNull final SelectedSelectionKeySet selectedKeySet) {
try {
@@ -165,7 +164,6 @@ abstract class AbstractChannelReplicator implements Closeable {
selectedKeysField.setAccessible(true);
publicSelectedKeysField.setAccessible(true);
Object old = selectedKeysField.get(selector);
selectedKeysField.set(selector, selectedKeySet);
publicSelectedKeysField.set(selector, selectedKeySet);
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+16 -7
View File
@@ -662,7 +662,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
}
@Override
public void getAll(File toFile) throws IOException {
public synchronized void getAll(File toFile) throws IOException {
final XStream xstream = new XStream(new JettisonMappedXmlDriver());
xstream.setMode(XStream.NO_REFERENCES);
@@ -679,7 +679,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
}
@Override
public void putAll(File fromFile) throws IOException {
public synchronized void putAll(File fromFile) throws IOException {
final XStream xstream = new XStream(new JettisonMappedXmlDriver());
xstream.setMode(XStream.NO_REFERENCES);
xstream.alias("chronicle-entries", net.openhft.chronicle.map.VanillaChronicleMap.EntrySet
@@ -700,17 +700,20 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
/**
* @return a lazily created XStreamConverter
*/
private XStreamConverter lazyXStreamConverter() {
private synchronized XStreamConverter lazyXStreamConverter() {
if (xStreamConverter == null)
return xStreamConverter;
final KeyValueSerializer<K, V> serializers = new KeyValueSerializer<K, V>(keyBuilder,
valueBuilder);
final ThreadLocalCopies threadLocalCopies = serializers.threadLocalCopies();
final Bytes buffer = new ByteBufferBytes(allocateDirect((int) entrySize)
final ByteBufferBytes buffer = new ByteBufferBytes(allocateDirect((int) entrySize)
.order(ByteOrder.nativeOrder()));
return new XStreamConverter(threadLocalCopies, buffer, serializers);
xStreamConverter = new XStreamConverter(threadLocalCopies, buffer, serializers);
return xStreamConverter;
}
@@ -721,7 +724,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
private Bytes buffer;
private final KeyValueSerializer<K, V> keyValueSerializer;
public XStreamConverter(ThreadLocalCopies threadLocalCopies, Bytes buffer, final KeyValueSerializer<K, V>
public XStreamConverter(ThreadLocalCopies threadLocalCopies, ByteBufferBytes buffer, final KeyValueSerializer<K, V>
keyValueSerializer) {
this.threadLocalCopies = threadLocalCopies;
this.buffer = buffer;
@@ -806,7 +809,13 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
if (kClass.isAssignableFrom(o.getClass())) {
String text = toKeyBytes((K) o).asString().toString();
Bytes bytes = (ByteBufferBytes) toKeyBytes((K) o);
String hex = AbstractBytes.toHex(bytes);
hex.toString();
String text = bytes.asString().toString();
System.out.println("key=" + text);
// writer.setValue(text);