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-230 - I flipped around the exception flag and the transaction id

Browse Source
This commit is contained in:
Rob Austin
2014-12-03 17:40:15 +00:00
parent 2c4cfa32ec
commit 8d28d0194d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+12 -9
View File
@@ -1520,7 +1520,7 @@ class StatelessServerConnector<K, V> {
writeException(writer, e);
writeSizeAndFlags(sizeLocation, true, writer);
writeSizeAndFlags(sizeLocation+SIZE_OF_TRANSACTION_ID, true, writer);
return null;
}
@@ -1845,17 +1845,19 @@ class StatelessServerConnector<K, V> {
}
private long reflectTransactionId(Bytes reader, Bytes writer) {
final long sizeLocation = writer.position();
writer.skip(TRANSACTION_ID_OFFSET); // isException + SIZE_OF_SIZE
final long transactionId = reader.readLong();
final long sizeLocation = writer.position();
writer.skip(SIZE_OF_SIZE);
writer.writeLong(transactionId);
writer.writeBoolean(false); // isException
return sizeLocation;
}
private void writeSizeAndFlags(long locationOfSize, boolean isException, Bytes out) {
final long size = out.position() - locationOfSize;
out.writeInt(locationOfSize, (int) size); // size
out.writeBoolean(locationOfSize + SIZE_OF_SIZE, isException); // isException
out.skip(SIZE_OF_TRANSACTION_ID);
out.writeBoolean(isException); // isException
}
private void writeException(Bytes out, Throwable e) {
@@ -1887,10 +1889,11 @@ class StatelessServerConnector<K, V> {
private long header(Bytes writer, final long transactionId) {
final long sizeLocation = writer.position();
writer.skip(TRANSACTION_ID_OFFSET);
writer.skip(SIZE_OF_SIZE);
writer.writeLong(transactionId);
// exception
writer.writeLong(transactionId);
writer.skip(1);
// hasAnotherChunk
writer.skip(1);
@@ -1909,12 +1912,12 @@ class StatelessServerConnector<K, V> {
// size in bytes
writer.writeInt(size);
// is exception
writer.writeBoolean(false);
//transaction id;
writer.skip(8);
// is exception
writer.writeBoolean(false);
writer.writeBoolean(hasAnotherChunk);
// count