From ff876d173f3fc7d9b5424cfa1ca05898d09b57dd Mon Sep 17 00:00:00 2001
From: octopus <912554887@qq.com>
Date: Wed, 24 Nov 2021 17:43:44 +0800
Subject: [PATCH] fix BcosSdk crash bug

---
 .../main/java/org/fisco/bcos/sdk/BcosSDK.java | 22 +++++++++----------
 .../java/org/fisco/bcos/sdk/BcosSDKTest.java  | 20 +++++++++++++++++
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
index 7a818a6c4..1f75d263a 100644
--- a/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
+++ b/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
@@ -24,24 +24,22 @@
 
 public class BcosSDK {
     private static Logger logger = LoggerFactory.getLogger(BcosSDK.class);
-    public static final String ECDSA_TYPE_STR = "ecdsa";
-    public static final String SM_TYPE_STR = "sm";
 
     private final ConfigOption config;
-    private org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk;
+    // private org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk;
     private org.fisco.bcos.sdk.jni.rpc.Rpc jniRpcImpl;
 
     public ConfigOption getConfig() {
         return config;
     }
 
-    public org.fisco.bcos.sdk.jni.BcosSDK getJniBcosSdk() {
-        return jniBcosSdk;
-    }
-
-    public void setJniBcosSdk(org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk) {
-        this.jniBcosSdk = jniBcosSdk;
-    }
+//    public org.fisco.bcos.sdk.jni.BcosSDK getJniBcosSdk() {
+//        return jniBcosSdk;
+//    }
+//
+//    public void setJniBcosSdk(org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk) {
+//        this.jniBcosSdk = jniBcosSdk;
+//    }
 
     /**
      * Build BcosSDK instance
@@ -67,9 +65,9 @@ public static BcosSDK build(String tomlConfigFilePath) throws BcosSDKException {
      * @throws BcosSDKException
      */
     public BcosSDK(ConfigOption configOption) throws BcosSDKException {
-        this.config = configOption;
         try {
-            this.jniBcosSdk = org.fisco.bcos.sdk.jni.BcosSDK.build(configOption.getJniConfig());
+            this.config = configOption;
+            // this.jniBcosSdk = org.fisco.bcos.sdk.jni.BcosSDK.build(configOption.getJniConfig());
             this.jniRpcImpl = org.fisco.bcos.sdk.jni.rpc.Rpc.build(config.getJniConfig());
         } catch (Exception e) {
             logger.warn("error: {}", e);
diff --git a/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java b/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java
index dd75f24bb..8ee4b89ee 100644
--- a/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java
+++ b/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java
@@ -18,6 +18,7 @@
 package org.fisco.bcos.sdk;
 
 import java.math.BigInteger;
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -345,4 +346,23 @@ public void testHelloWorldInLiquid() throws ConfigException, JniException, Contr
         s2 = helloWorld.get();
         System.out.println("helloworld get :" + s2);
     }
+
+    @Test
+    public void testGetGroupList() throws ConfigException, JniException {
+        ConfigOption configOption = Config.load(configFile);
+
+        System.out.println("configOption: " + configOption);
+
+        Client clientWithoutGroupId = Client.build(configOption);
+        System.out.println("build clientWithoutGroupId");
+        List<String> groupList = clientWithoutGroupId.getGroupList().getResult().getGroupList();
+        System.out.println("getGroupList: " + groupList);
+
+        BcosSDK bcosSDK = new BcosSDK(configOption);
+        for(String groupId: groupList) {
+            Client client = bcosSDK.getClient(groupId);
+            System.out.println("build client, groupId: " + groupId);
+            System.out.println("getBlockNumber, blk: " + client.getBlockNumber().getBlockNumber());
+        }
+    }
 }