Merge branch 'develop' of https://gitlab.peersafe.cn:4430/chainsql/java-chainsql-api into develop

liuchen · liuchen · commit cc1af84765b4 · 2022-04-28T15:53:50.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/base/client/Client.java b/chainsql/src/main/java/com/peersafe/base/client/Client.java
@@ -588,7 +588,9 @@ public void run(Runnable runnable) {
         if (runningOnClientThread()) {
             runnable.run();
         } else {
-            service.submit(errorHandling(runnable));
+            if(!service.isShutdown()){
+                service.submit(errorHandling(runnable));
+            }
         }
     }
 
@@ -598,7 +600,9 @@ public void run(Runnable runnable) {
      * @param runnable Runnable object.
      */
     public void schedule(long ms, Runnable runnable) {
-        service.schedule(errorHandling(runnable), ms, TimeUnit.MILLISECONDS);
+        if(!service.isShutdown()) {
+            service.schedule(errorHandling(runnable), ms, TimeUnit.MILLISECONDS);
+        }
     }
 
     private boolean runningOnClientThread() {

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,9 @@ public void run(Runnable runnable) {`
`588`	`588`	`if (runningOnClientThread()) {`
`589`	`589`	`runnable.run();`
`590`	`590`	`} else {`
`591`		`- service.submit(errorHandling(runnable));`
	`591`	`+ if(!service.isShutdown()){`
	`592`	`+ service.submit(errorHandling(runnable));`
	`593`	`+ }`
`592`	`594`	`}`
`593`	`595`	`}`
`594`	`596`
`@@ -598,7 +600,9 @@ public void run(Runnable runnable) {`
`598`	`600`	`* @param runnable Runnable object.`
`599`	`601`	`*/`
`600`	`602`	`public void schedule(long ms, Runnable runnable) {`
`601`		`- service.schedule(errorHandling(runnable), ms, TimeUnit.MILLISECONDS);`
	`603`	`+ if(!service.isShutdown()) {`
	`604`	`+ service.schedule(errorHandling(runnable), ms, TimeUnit.MILLISECONDS);`
	`605`	`+ }`
`602`	`606`	`}`
`603`	`607`
`604`	`608`	`private boolean runningOnClientThread() {`