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

Don't assume timestamp = 0 is impossible in ReplicatedChronicleMap

Browse Source
This commit is contained in:
leventov
2015-01-19 07:10:07 +07:00
parent cad8b833ce
commit dda6fcbaa7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+5 -6
View File
@@ -341,7 +341,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
byte newIdentifier;
void initReplicationUpdate() {
if (newTimestamp != 0L)
if (newIdentifier != 0)
return;
checkMapInit();
initReplicationUpdate0();
@@ -357,7 +357,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
}
void closeReplicationUpdate() {
if (newTimestamp == 0L)
if (newIdentifier == 0)
return;
closeReplicationUpdate0();
}
@@ -376,7 +376,6 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
void writeReplicationBytes() {
entry.writeLong(replicationBytesOffset, newTimestamp);
entry.writeByte(replicationBytesOffset + 8L, newIdentifier);
}
void writeDeleted() {
@@ -502,9 +501,9 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
}
boolean shouldIgnore() {
if (timestamp == 0L || newTimestamp == 0L)
throw new IllegalStateException("Own entry replication state or " +
"update replication state is not initialized");
assert identifier != 0 && newIdentifier != 0 :
"Own entry replication state or " +
"update replication state is not initialized";
if (timestamp < newTimestamp)
return false;
if (timestamp > newTimestamp)