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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Rob Austin
2014-12-16 11:08:59 +00:00
parent d0b56c7eaa b2ad8f6acb
commit c7b7af8e2b
6 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+2 -1
View File
@@ -460,10 +460,11 @@ public class CHMUseCasesTest {
}
}
@Ignore("HCOLL-248 Issue with acquireUsingLocked() for a StringBuilder Value")
@Test
public void testAcquireUsingWithIntValueKeyStringBuilderValue() throws IOException {
if (typeOfMap == TypeOfMap.STATELESS)
return; // acquireUsingLocked supported by the STATELESS client
ChronicleMapBuilder<IntValue, StringBuilder> builder = ChronicleMapBuilder
.of(IntValue.class, StringBuilder.class);
src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireUsingLockedTest.java
+6 -7
View File
@@ -3,7 +3,6 @@ package net.openhft.chronicle.map;
import eg.TestInstrumentVOInterface;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import java.net.InetSocketAddress;
@@ -14,7 +13,6 @@ import java.net.InetSocketAddress;
public class TcpReplicationWithAcquireUsingLockedTest {
@Ignore("HCOLL-253 TcpReplication is not working when used with acquireUsingLocked")
@Test
public void testReplicationWithAcquireUsingLocked() throws Exception {
@@ -31,10 +29,12 @@ public class TcpReplicationWithAcquireUsingLockedTest {
map1a = map1;
TcpTransportAndNetworkConfig config2 = TcpTransportAndNetworkConfig.of(8077, new InetSocketAddress("127.0.0.1", 8076));
TcpTransportAndNetworkConfig config2 =
TcpTransportAndNetworkConfig.of(8077, new InetSocketAddress("127.0.0.1", 8076));
try (ChronicleMap<CharSequence, TestInstrumentVOInterface> map2 = ChronicleMapBuilder.of(CharSequence.class,
try (ChronicleMap<CharSequence, TestInstrumentVOInterface> map2 =
ChronicleMapBuilder.of(CharSequence.class,
TestInstrumentVOInterface.class)
.replication((byte) 2, config2)
.create()) {
@@ -45,9 +45,8 @@ public class TcpReplicationWithAcquireUsingLockedTest {
TestInstrumentVOInterface instrumentVOInterface = map1.newValueInstance();
try (WriteContext<CharSequence, TestInstrumentVOInterface> wc = map1
.acquireUsingLocked
("KEY1", instrumentVOInterface)) {
try (WriteContext<CharSequence, TestInstrumentVOInterface> wc =
map1.acquireUsingLocked("KEY1", instrumentVOInterface)) {
instrumentVOInterface.setSymbol("Flyer");
instrumentVOInterface.setCurrencyCode("USA");
}