Skip to content

Commit 3ef0da1

Browse files
authored
cherry-pick(#1314): fix: NPE after pause (#1315)
1 parent ef86560 commit 3ef0da1

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,10 @@ void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
445445

446446
@Override
447447
public void setDefaultNavigationTimeout(double timeout) {
448+
setDefaultNavigationTimeoutImpl(timeout);
449+
}
450+
451+
void setDefaultNavigationTimeoutImpl(Double timeout) {
448452
withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
449453
timeoutSettings.setDefaultNavigationTimeout(timeout);
450454
JsonObject params = new JsonObject();
@@ -455,6 +459,10 @@ public void setDefaultNavigationTimeout(double timeout) {
455459

456460
@Override
457461
public void setDefaultTimeout(double timeout) {
462+
setDefaultTimeoutImpl(timeout);
463+
}
464+
465+
void setDefaultTimeoutImpl(Double timeout) {
458466
withLogging("BrowserContext.setDefaultTimeout", () -> {
459467
timeoutSettings.setDefaultTimeout(timeout);
460468
JsonObject params = new JsonObject();

playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -938,13 +938,13 @@ public void pause() {
938938
withLogging("Page.pause", () -> {
939939
Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout();
940940
Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout();
941-
browserContext.setDefaultNavigationTimeout(0);
942-
browserContext.setDefaultTimeout(0);
941+
browserContext.setDefaultNavigationTimeoutImpl(0.0);
942+
browserContext.setDefaultTimeoutImpl(0.0);
943943
try {
944944
runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
945945
} finally {
946-
browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout);
947-
browserContext.setDefaultTimeout(defaultTimeout);
946+
browserContext.setDefaultNavigationTimeoutImpl(defaultNavigationTimeout);
947+
browserContext.setDefaultTimeoutImpl(defaultTimeout);
948948
}
949949
});
950950
}

playwright/src/main/java/com/microsoft/playwright/impl/TimeoutSettings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Double defaultNavigationTimeout() {
3737
return defaultNavigationTimeout;
3838
}
3939

40-
void setDefaultTimeout(double timeout) {
40+
void setDefaultTimeout(Double timeout) {
4141
defaultTimeout = timeout;
4242
}
4343

44-
void setDefaultNavigationTimeout(double timeout) {
44+
void setDefaultNavigationTimeout(Double timeout) {
4545
defaultNavigationTimeout = timeout;
4646
}
4747

0 commit comments

Comments
 (0)