Skip to content

Commit c709dc1

Browse files
committed
address feedback
1 parent e8527cb commit c709dc1

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ ResponseImpl navigateImpl(String url, NavigateOptions options) {
465465
if (options == null) {
466466
options = new NavigateOptions();
467467
}
468-
options.timeout = timeout(options.timeout);
468+
options.timeout = navigationTimeout(options.timeout);
469469
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
470470
params.addProperty("url", url);
471471
JsonElement result = sendMessage("goto", params);
@@ -1184,18 +1184,16 @@ protected void handleEvent(String event, JsonObject params) {
11841184
}
11851185

11861186
protected double timeout(Double timeout) {
1187-
TimeoutSettings timeoutSettings = page.timeoutSettings;
1188-
if (timeoutSettings == null) {
1189-
timeoutSettings = new TimeoutSettings();
1187+
if (page != null) {
1188+
return page.timeoutSettings.timeout(timeout);
11901189
}
1191-
return timeoutSettings.timeout(timeout);
1190+
return new TimeoutSettings().timeout(timeout);
11921191
}
11931192

11941193
protected double navigationTimeout(Double timeout) {
1195-
TimeoutSettings timeoutSettings = page.timeoutSettings;
1196-
if (timeoutSettings == null) {
1197-
timeoutSettings = new TimeoutSettings();
1194+
if (page != null) {
1195+
return page.timeoutSettings.navigationTimeout(timeout);
11981196
}
1199-
return timeoutSettings.navigationTimeout(timeout);
1197+
return new TimeoutSettings().navigationTimeout(timeout);
12001198
}
12011199
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ private Response reloadImpl(ReloadOptions options) {
10971097
if (options == null) {
10981098
options = new ReloadOptions();
10991099
}
1100-
options.timeout = timeoutSettings.timeout(options.timeout);
1100+
options.timeout = timeoutSettings.navigationTimeout(options.timeout);
11011101
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
11021102
JsonObject json = sendMessage("reload", params).getAsJsonObject();
11031103
if (json.has("response")) {

0 commit comments

Comments
 (0)