fix: NPE after pause (#1314)

microsoft · Jun 20, 2023 · d219fdd · d219fdd
1 parent 7a1bbe2
commit d219fdd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -445,6 +445,10 @@ void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
 
   @Override
   public void setDefaultNavigationTimeout(double timeout) {
+    setDefaultNavigationTimeoutImpl(timeout);
+  }
+
+  void setDefaultNavigationTimeoutImpl(Double timeout) {
     withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
       timeoutSettings.setDefaultNavigationTimeout(timeout);
       JsonObject params = new JsonObject();
@@ -455,6 +459,10 @@ public void setDefaultNavigationTimeout(double timeout) {
 
   @Override
   public void setDefaultTimeout(double timeout) {
+    setDefaultTimeoutImpl(timeout);
+  }
+
+  void setDefaultTimeoutImpl(Double timeout) {
     withLogging("BrowserContext.setDefaultTimeout", () -> {
       timeoutSettings.setDefaultTimeout(timeout);
       JsonObject params = new JsonObject();

diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -938,13 +938,13 @@ public void pause() {
     withLogging("Page.pause", () -> {
       Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout();
       Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout();
-      browserContext.setDefaultNavigationTimeout(0);
-      browserContext.setDefaultTimeout(0);
+      browserContext.setDefaultNavigationTimeoutImpl(0.0);
+      browserContext.setDefaultTimeoutImpl(0.0);
       try {
         runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
       } finally {
-        browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout);
-        browserContext.setDefaultTimeout(defaultTimeout);
+        browserContext.setDefaultNavigationTimeoutImpl(defaultNavigationTimeout);
+        browserContext.setDefaultTimeoutImpl(defaultTimeout);
       }
     });
   }

diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/TimeoutSettings.java b/playwright/src/main/java/com/microsoft/playwright/impl/TimeoutSettings.java
@@ -37,11 +37,11 @@ Double defaultNavigationTimeout() {
     return defaultNavigationTimeout;
   }
 
-  void setDefaultTimeout(double timeout) {
+  void setDefaultTimeout(Double timeout) {
     defaultTimeout = timeout;
   }
 
-  void setDefaultNavigationTimeout(double timeout) {
+  void setDefaultNavigationTimeout(Double timeout) {
     defaultNavigationTimeout = timeout;
   }