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-155 cleaned up putOnClose

Browse Source
This commit is contained in:
Rob Austin
2014-11-02 23:18:58 +00:00
parent 2e98febfeb
commit 580b6aba78
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+12 -11
View File
@@ -412,15 +412,14 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
V v = segment.acquireWithoutLock(copies, metaKeyInterop, keyInterop, key, value,
segmentHash, lockTypeType == LockType.WRITE_LOCK);
lock.copies = copies;
lock.metaKeyInterop = metaKeyInterop;
lock.keyInterop = keyInterop;
lock.segmentHash = segmentHash;
lock.value = null;
if (v == null && lockTypeType == LockType.WRITE_LOCK) {
if (!isNativeValueClass && lockTypeType == LockType.WRITE_LOCK && v == null)
v = value;
}
lock.value(v);
lock.key(key);
@@ -705,30 +704,30 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
final MutableLockedEntry<K, V, MKI, KI>
heapWriteUnlock = new WriteLocked<K, V, MKI, KI>() {
boolean dontPutOnClose;
private boolean putOnClose = true;
@Override
public void close() {
if (copies != null && !dontPutOnClose)
if (putOnClose)
putWithoutLock(copies, metaKeyInterop, keyInterop, key(), value(),
segmentHash, true);
copies = null;
dontPutOnClose = false;
putOnClose = true;
Segment.this.writeUnlock();
}
@Override
public void dontPutOnClose() {
dontPutOnClose = true;
putOnClose = false;
}
@Override
public void removeEntry() {
dontPutOnClose = true;
if (copies != null)
removeWithoutLock(copies, metaKeyInterop, keyInterop, key(), null, segmentHash);
putOnClose = false;
removeWithoutLock(copies, metaKeyInterop, keyInterop, key(), null, segmentHash);
}
@@ -1634,6 +1633,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
KI keyInterop;
long segmentHash;
private K key;
private V value;
@@ -1678,6 +1678,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
private static abstract class WriteLocked<K, V, MKI, KI> extends MutableLockedEntry<K, V, MKI,
KI> implements WriteContext<K, V> {
}
}