2020-09-14 常识修改卡死的问题

fanyong920 · Sep 14, 2020 · be2b07a · be2b07a
1 parent 1125e17
commit be2b07a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/ruiyun/jvppeteer/core/page/JSHandle.java b/src/main/java/com/ruiyun/jvppeteer/core/page/JSHandle.java
@@ -117,7 +117,7 @@ public void dispose() {
      * 当在websocket信息回调中处理时需要isBlock=false
      * @param isBlock 是否是异步
      */
-    public void dispose(boolean isBlock) {
+    private void dispose(boolean isBlock) {
         if (this.disposed)
             return;
         this.disposed = true;

diff --git a/src/main/java/com/ruiyun/jvppeteer/util/Helper.java b/src/main/java/com/ruiyun/jvppeteer/util/Helper.java
@@ -381,20 +381,20 @@ public static Object valueFromRemoteObject(RemoteObject remoteObject) {
 
     public static void releaseObject(CDPSession client, RemoteObject remoteObject, boolean isBlock) {
         if (isBlock) {
-            releaseObject(client, remoteObject);
+            doReleaseObject(client, remoteObject,isBlock);
         } else {
-            Helper.commonExecutor().submit(() -> releaseObject(client, remoteObject));
+            Helper.commonExecutor().submit(() -> doReleaseObject(client, remoteObject,isBlock));
         }
 
     }
 
-    private static void releaseObject(CDPSession client, RemoteObject remoteObject) {
+    private static void doReleaseObject(CDPSession client, RemoteObject remoteObject,boolean isBlock) {
         if (StringUtil.isEmpty(remoteObject.getObjectId()))
             return;
         Map<String, Object> params = new HashMap<>();
         params.put("objectId", remoteObject.getObjectId());
         try {
-            client.send("Runtime.releaseObject", params, true);
+            client.send("Runtime.releaseObject", params, isBlock);
         } catch (Exception e) {
             // Exceptions might happen in case of a page been navigated or closed.
             //重新导航到某个网页 或者页面已经关闭