fluencelabs/jabci
1
0
Fork 0
mirror of https://github.com/fluencelabs/jabci synced 2025-05-29 23:31:18 +00:00
Code Issues Projects Releases Wiki Activity

JavaCounter: quick fixes

Browse Source 
-  some encoding issues so we always interpret everything in UTF-8
- take note of the current issue with invoking threads in a constructor, quick fixed by finalizing JavaCounter
This commit is contained in:
Stephan Müller 2017-06-08 14:23:06 +02:00
parent f81e092a0d
commit 027acf1c02
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/github/jtendermint/jabci/JavaCounter.java
View File

@ -25,6 +25,7 @@ package com.github.jtendermint.jabci;
import java.math.BigInteger; import java.math.BigInteger;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import com.github.jtendermint.jabci.api.ICheckTx; import com.github.jtendermint.jabci.api.ICheckTx;
import com.github.jtendermint.jabci.api.ICommit; import com.github.jtendermint.jabci.api.ICommit;
@ -48,7 +49,7 @@ import com.google.protobuf.ByteString;
* *
* @author wolfposd * @author wolfposd
*/ */
public class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery { public final class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery {
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
new JavaCounter(); new JavaCounter();
@ -64,6 +65,11 @@ public class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery {
socket.registerListener(this); socket.registerListener(this);
// TODO this is wrong once you subclass this JavaCounter
/*
* The constructor starts a thread. This is likely to be wrong if the class is ever extended/subclassed, since the thread will be
* started before the subclass constructor is started.
*/
Thread t = new Thread(socket::start); Thread t = new Thread(socket::start);
t.setName("Java Counter Main Thread"); t.setName("Java Counter Main Thread");
t.start(); t.start();
@ -134,12 +140,13 @@ public class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery {
@Override @Override
public ResponseQuery requestQuery(RequestQuery req) { public ResponseQuery requestQuery(RequestQuery req) {
final String query = new String(req.getData().toByteArray()); final String query = new String(req.getData().toByteArray(), Charset.forName("UTF-8"));
switch (query) { switch (query) {
case "hash": case "hash":
return ResponseQuery.newBuilder().setCode(CodeType.OK).setValue(ByteString.copyFrom(("" + hashCount).getBytes())).build(); return ResponseQuery.newBuilder().setCode(CodeType.OK)
.setValue(ByteString.copyFrom(("" + hashCount).getBytes(Charset.forName("UTF-8")))).build();
case "tx": case "tx":
return ResponseQuery.newBuilder().setCode(CodeType.OK).setValue(ByteString.copyFrom(("" + txCount).getBytes())).build(); return ResponseQuery.newBuilder().setCode(CodeType.OK).setValue(ByteString.copyFrom(("" + txCount).getBytes(Charset.forName("UTF-8")))).build();
default: default:
return ResponseQuery.newBuilder().setCode(CodeType.BadNonce).setLog("Invalid query path. Expected hash or tx, got " + query) return ResponseQuery.newBuilder().setCode(CodeType.BadNonce).setLog("Invalid query path. Expected hash or tx, got " + query)
.build(); .build();