update code for ssl connect

liuchen · liuchen · commit 641ad3d04cf8 · 2022-04-28T15:53:42.000+08:00
diff --git a/chainsql/.settings/org.eclipse.core.resources.prefs b/chainsql/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding//src/test/java/Test.java=UTF-8
 encoding/<project>=UTF-8
diff --git a/chainsql/src/main/java/com/peersafe/base/client/transport/impl/JavaWebSocketTransportImpl.java b/chainsql/src/main/java/com/peersafe/base/client/transport/impl/JavaWebSocketTransportImpl.java
@@ -221,7 +221,7 @@ public void connectSSL(URI uri, String[] trustCAsPath, String sslKeyPath, String
         if(trustCAsPath.length != 0) {
             String certSigAlg = ((X509Certificate)readCert(trustCAsPath[0])).getSigAlgName();
             String certPubKeyAlg = "0608";
-            if(sslCertPath.length() != 0) {
+            if(sslCertPath != null) {
                 PemReader pemReader = new PemReader(new InputStreamReader(new FileInputStream(sslCertPath)));
                 byte[] subPubkeyInfo = org.bouncycastle.asn1.x509.Certificate.getInstance(pemReader.readPemObject()
                                 .getContent()).getSubjectPublicKeyInfo().getEncoded();
diff --git a/chainsql/src/main/java/com/peersafe/base/client/transport/impl/WebSocketClientHandler.java b/chainsql/src/main/java/com/peersafe/base/client/transport/impl/WebSocketClientHandler.java
@@ -108,9 +108,16 @@ private void addCloseDetectListener(Channel channel) {
                     @Override
                     public void operationComplete(ChannelFuture future )
                     throws Exception {
-                        TransportEventHandler teHandler = tranEventh.get();
-                        if (teHandler != null) {
-                            teHandler.onDisconnected(false);
+                        if(future.isDone() && future.isSuccess()) {
+                            System.out.println("syn operation complete successfully");
+                        } else if(future.isDone() && future.isCancellable()) {
+                            System.out.println("syn operation complete cancellation");
+                        } else {
+                            future.cause().printStackTrace();
+                            TransportEventHandler teHandler = tranEventh.get();
+                            if (teHandler != null) {
+                                teHandler.onDisconnected(false);
+                            }
                         }
                     }
                 });
@@ -135,6 +142,10 @@ public void channelActive(ChannelHandlerContext ctx) {
     @Override
     public void channelInactive(ChannelHandlerContext ctx) {
         System.out.println("WebSocket Client disconnected!");
+        TransportEventHandler teHandler = tranEventh.get();
+        if (teHandler != null) {
+            teHandler.onDisconnected(false);
+        }
     }
 
     @Override
