Don't forward calls to close or setParent during shutdown

magreenblatt · magreenblatt · commit 028ae3885bb6 · 2020-07-31T11:57:27.000-04:00
Also mark the related variables as volatile because they may be accessed
from multiple threads.
diff --git a/java/org/cef/browser/CefBrowser_N.java b/java/org/cef/browser/CefBrowser_N.java
@@ -46,7 +46,8 @@ abstract class CefBrowser_N extends CefNativeAdapter implements CefBrowser {
     private Point inspectAt_ = null;
     private CefBrowser_N devTools_ = null;
     private boolean closeAllowed_ = false;
-    private boolean isClosed_ = false;
+    private volatile boolean isClosed_ = false;
+    private volatile boolean isClosing_ = false;
 
     protected CefBrowser_N(CefClient client, String url, CefRequestContext context,
             CefBrowser_N parent, Point inspectAt) {
@@ -434,6 +435,9 @@ public String getURL() {
 
     @Override
     public void close(boolean force) {
+        if (isClosing_ || isClosed_) return;
+        if (force) isClosing_ = true;
+
         try {
             N_Close(force);
         } catch (UnsatisfiedLinkError ule) {
@@ -720,6 +724,8 @@ protected final void updateUI(Rectangle contentRect, Rectangle browserRect) {
     }
 
     protected final void setParent(long windowHandle, Component canvas) {
+        if (isClosing_ || isClosed_) return;
+
         try {
             N_SetParent(windowHandle, canvas);
         } catch (UnsatisfiedLinkError ule) {
diff --git a/java/tests/detailed/BrowserFrame.java b/java/tests/detailed/BrowserFrame.java
@@ -14,7 +14,7 @@
 import org.cef.handler.CefLifeSpanHandlerAdapter;
 
 public class BrowserFrame extends JFrame {
-    private boolean isClosed_ = false;
+    private volatile boolean isClosed_ = false;
     private CefBrowser browser_ = null;
     private static int browserCount_ = 0;
     private Runnable afterParentChangedAction_ = null;
