Skip to content

Commit 9eaa9a3

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: chronicle/src/test/java/com/higherfrequencytrading/chronicle/examples/ExampleSimpleWriteReadMain.java
2 parents 100e1f4 + c88a074 commit 9eaa9a3

File tree

8 files changed

+448
-40
lines changed

8 files changed

+448
-40
lines changed

chronicle-fix/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>chronicle-parent</artifactId>
2323
<groupId>com.higherfrequencytrading</groupId>
24-
<version>1.7.2-SNAPSHOT</version>
24+
<version>1.7.3-SNAPSHOT</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

chronicle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>com.higherfrequencytrading</groupId>
2525
<artifactId>chronicle</artifactId>
26-
<version>1.7.2-SNAPSHOT</version>
26+
<version>1.7.3-SNAPSHOT</version>
2727
<name>Java Chronicle</name>
2828
<description>High Performance Logging and Persisted Messaging</description>
2929

chronicle/src/main/java/com/higherfrequencytrading/chronicle/StopCharTesters.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @author peter.lawrey
2121
*/
2222
public enum StopCharTesters implements StopCharTester {
23-
TAB_TEXT {
23+
CONTROL_STOP {
2424
@Override
2525
public boolean isStopChar(int ch) {
2626
return ch < ' ';
@@ -68,13 +68,4 @@ public boolean isStopChar(int ch) {
6868
return this.ch == ch;
6969
}
7070
}
71-
72-
public static StopCharTester CONTROL_STOP = new ControlStopCSTester();
73-
74-
static class ControlStopCSTester implements StopCharTester {
75-
@Override
76-
public boolean isStopChar(int ch) {
77-
return ch < ' ';
78-
}
79-
}
8071
}

chronicle/src/test/java/com/higherfrequencytrading/chronicle/examples/ExampleSimpleWriteReadMain.java

Lines changed: 437 additions & 20 deletions
Large diffs are not rendered by default.

demo/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<groupId>com.higherfrequencytrading</groupId>
2424
<artifactId>chronicle-parent</artifactId>
25-
<version>1.7.2-SNAPSHOT</version>
25+
<version>1.7.3-SNAPSHOT</version>
2626
</parent>
2727

2828
<groupId>com.higherfrequencytrading</groupId>
2929
<artifactId>chronicle-demo</artifactId>
3030

3131
<name>chronicle-demo</name>
32-
<version>1.7.2-SNAPSHOT</version>
32+
<version>1.7.3-SNAPSHOT</version>
3333
<description>Demo Processing Engine</description>
3434
<dependencies>
3535
<dependency>
@@ -43,4 +43,4 @@
4343
</dependency>
4444
</dependencies>
4545

46-
</project>
46+
</project>

hiccup/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.higherfrequencytrading</groupId>
3232
<artifactId>chronicle</artifactId>
33-
<version>1.7.2-SNAPSHOT</version>
33+
<version>1.7.3-SNAPSHOT</version>
3434
</dependency>
3535
</dependencies>
3636
</project>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>com.higherfrequencytrading</groupId>
2525
<artifactId>chronicle-parent</artifactId>
26-
<version>1.7.2-SNAPSHOT</version>
26+
<version>1.7.3-SNAPSHOT</version>
2727
<packaging>pom</packaging>
2828

2929
<name>chronicle-parent</name>

testing/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<parent>
2525
<groupId>com.higherfrequencytrading</groupId>
2626
<artifactId>chronicle-parent</artifactId>
27-
<version>1.7.2-SNAPSHOT</version>
27+
<version>1.7.3-SNAPSHOT</version>
2828
</parent>
2929

3030
<groupId>com.higherfrequencytrading</groupId>
3131
<artifactId>chronicle-testing</artifactId>
32-
<version>1.7.2-SNAPSHOT</version>
32+
<version>1.7.3-SNAPSHOT</version>
3333

3434
<dependencies>
3535
<dependency>
@@ -58,4 +58,4 @@
5858
<artifactId>junit</artifactId>
5959
</dependency>
6060
</dependencies>
61-
</project>
61+
</project>

0 commit comments

Comments
 (0)