Skip to content

Commit 6e0a8b7

Browse files
committed
simplify code
1 parent 2c2e1bc commit 6e0a8b7

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/main/java/org/htmlunit/html/ScriptElementSupport.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.commons.logging.LogFactory;
2424
import org.htmlunit.FailingHttpStatusCodeException;
2525
import org.htmlunit.SgmlPage;
26+
import org.htmlunit.WebClient;
2627
import org.htmlunit.WebWindow;
2728
import org.htmlunit.html.HtmlPage.JavaScriptLoadResult;
2829
import org.htmlunit.javascript.AbstractJavaScriptEngine;
@@ -73,7 +74,8 @@ public static void onAllChildrenAddedToPage(final ScriptElement script, final bo
7374
LOG.debug("Script node added: " + element.asXml());
7475
}
7576

76-
if (!element.getPage().getWebClient().isJavaScriptEngineEnabled()) {
77+
final WebClient webClient = element.getPage().getWebClient();
78+
if (!webClient.isJavaScriptEngineEnabled()) {
7779
LOG.debug("Script found but not executed because javascript engine is disabled");
7880
return;
7981
}
@@ -116,23 +118,19 @@ public void execute() {
116118
}
117119
};
118120

119-
final AbstractJavaScriptEngine<?> engine = element.getPage().getWebClient().getJavaScriptEngine();
120-
if (engine != null
121-
&& element.hasAttribute("async") && !engine.isScriptRunning()) {
121+
final AbstractJavaScriptEngine<?> engine = webClient.getJavaScriptEngine();
122+
if (element.hasAttribute("async") && !engine.isScriptRunning()) {
122123
final HtmlPage owningPage = element.getHtmlPageOrNull();
123124
owningPage.addAfterLoadAction(action);
124125
}
125-
else if (engine != null
126-
&& (element.hasAttribute("async")
127-
|| postponed && StringUtils.isBlank(element.getTextContent()))) {
126+
else if (element.hasAttribute("async")
127+
|| postponed && StringUtils.isBlank(element.getTextContent())) {
128128
engine.addPostponedAction(action);
129129
}
130130
else {
131131
try {
132132
action.execute();
133-
if (engine != null) {
134-
engine.processPostponedActions();
135-
}
133+
engine.processPostponedActions();
136134
}
137135
catch (final RuntimeException e) {
138136
throw e;

0 commit comments

Comments
 (0)