From 2468cad51ae3e8ce4626e69d6b11f71fbd61350d Mon Sep 17 00:00:00 2001 From: maggie Date: Fri, 25 Sep 2020 12:27:50 +0800 Subject: [PATCH] solve amop bug --- .../java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java | 2 -- sdk-core/src/main/java/org/fisco/bcos/sdk/model/AmopMsg.java | 4 ++-- .../fisco/bcos/sdk/demo/amop/tool/AmopSubscriberPrivate.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java index faa6bc6f5..b677c3da6 100644 --- a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java +++ b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java @@ -138,7 +138,6 @@ public void onVerifyRequest(ChannelHandlerContext ctx, Message msg) { msg.getSeq(), msg.getType(), new String(msg.getData())); - // Response to node at the first time. responseVerifyRequest(ctx, msg); @@ -165,7 +164,6 @@ public void onVerifyRequest(ChannelHandlerContext ctx, Message msg) { msg.getSeq(), topic, nodeId); - // Reply random value to node String rmdString = UUID.randomUUID().toString().replaceAll("-", ""); AmopMsg respMsg = new AmopMsg(); diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/model/AmopMsg.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/model/AmopMsg.java index 76a804eae..aae276663 100644 --- a/sdk-core/src/main/java/org/fisco/bcos/sdk/model/AmopMsg.java +++ b/sdk-core/src/main/java/org/fisco/bcos/sdk/model/AmopMsg.java @@ -54,10 +54,10 @@ public Message getMessage() { msg.setType(this.type); msg.setSeq(this.seq); - byte[] msgData = new byte[length - Message.HEADER_LENGTH + 1 + topic.length()]; + byte[] msgData = new byte[length - Message.HEADER_LENGTH + 1 + topic.getBytes().length]; ByteBuf out = Unpooled.buffer(); writeExtra(out); - out.readBytes(msgData, 0, length - Message.HEADER_LENGTH + 1 + topic.length()); + out.readBytes(msgData, 0, length - Message.HEADER_LENGTH + 1 + topic.getBytes().length); msg.setData(msgData); return msg; } diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/amop/tool/AmopSubscriberPrivate.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/amop/tool/AmopSubscriberPrivate.java index ddac93b18..380c7b740 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/amop/tool/AmopSubscriberPrivate.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/amop/tool/AmopSubscriberPrivate.java @@ -40,6 +40,5 @@ public static void main(String[] args) throws Exception { km = new PEMKeyStore(privateKeyFile); } amop.subscribePrivateTopics(topic, km, cb); - amop.subscribeTopic(topic, cb); } }