This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new d0ef478 [NETBEANS-4123] PAC evaluator scripts runs just one at a time. new eb15c28 Merge pull request #2260 from sdedic/bugfix/synchronized-pac-eval d0ef478 is described below commit d0ef478a8a571dd363405b1e76c4adb2076888bf Author: Svata Dedic <svatopluk.de...@oracle.com> AuthorDate: Thu Jul 16 18:33:06 2020 +0200 [NETBEANS-4123] PAC evaluator scripts runs just one at a time. --- .../netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java index 11c97b4..52def8a 100644 --- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java +++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java @@ -204,7 +204,7 @@ public class NbPacScriptEvaluator implements PacScriptEvaluator { resultCache = null; } } - + @Override public List<Proxy> findProxyForURL(URI uri) throws PacValidationException { @@ -218,7 +218,10 @@ public class NbPacScriptEvaluator implements PacScriptEvaluator { } } try { - Object jsResult = scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost()); + Object jsResult; + synchronized (scriptEngine) { + jsResult = scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost()); + } jsResultAnalyzed = analyzeResult(uri, jsResult); if (canUseURLCaching && (resultCache != null)) { resultCache.put(uri, jsResultAnalyzed); // save the result in the cache --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists