Skip to content

Updates on 8036 patch #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2024
Merged

Updates on 8036 patch #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions patches/8036-draft.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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 76bb6080c73c..a708698bd008 100644
index 76bb6080c73c..da54d0c76922 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
@@ -26,6 +26,7 @@
Expand Down Expand Up @@ -29,17 +29,16 @@ index 76bb6080c73c..a708698bd008 100644
private final String pacScriptSource;


@@ -213,7 +219,8 @@ public NbPacScriptEvaluator(String pacSourceCocde) throws PacParsingException {
@@ -213,7 +219,7 @@ public NbPacScriptEvaluator(String pacSourceCocde) throws PacParsingException {
@Override
public List<Proxy> findProxyForURL(URI uri) throws PacValidationException {

- List<Proxy> jsResultAnalyzed;
+ AtomicReference<List<Proxy>> resultHolder = new AtomicReference<>(null);
+ List<Proxy> jsResultAnalyzed = null;

// First try the cache
if (resultCache != null) {
@@ -222,38 +229,36 @@ public List<Proxy> findProxyForURL(URI uri) throws PacValidationException {
@@ -222,38 +228,37 @@ public List<Proxy> findProxyForURL(URI uri) throws PacValidationException {
return jsResultAnalyzed;
}
}
Expand Down Expand Up @@ -73,6 +72,7 @@ index 76bb6080c73c..a708698bd008 100644
+ if (timeout <= 0){
+ jsResultAnalyzed = executeProxyScript(uri);
+ } else {
+ AtomicReference<List<Proxy>> resultHolder = new AtomicReference<>(null);
+ Task task = getRequestProcessor().post(() -> {
+ resultHolder.set(executeProxyScript(uri));
+ });
Expand All @@ -93,10 +93,10 @@ index 76bb6080c73c..a708698bd008 100644
- LOGGER.log(Level.WARNING, "Error when executing PAC script function " + scriptEngine.getJsMainFunction().getJsFunctionName() + " : ", ex);
- return Collections.singletonList(Proxy.NO_PROXY);
+ jsResultAnalyzed = resultHolder.get();
+ }
}
+ if (canUseURLCaching && (resultCache != null) && (jsResultAnalyzed != null)) {
+ resultCache.put(uri, jsResultAnalyzed); // save the result in the cache
}
+ }
+ return jsResultAnalyzed != null ? jsResultAnalyzed : Collections.singletonList(Proxy.NO_PROXY);
}
-
Expand Down Expand Up @@ -210,15 +210,15 @@ index 178c9b162feb..90812bfa4612 100644
testPacFile2("pac-test4.js", factory);
}
diff --git a/platform/o.n.core/src/org/netbeans/core/ProxySettings.java b/platform/o.n.core/src/org/netbeans/core/ProxySettings.java
index 2d29427cd3c2..19e48d9bad82 100644
index 2d29427cd3c2..593c99f5d6fe 100644
--- a/platform/o.n.core/src/org/netbeans/core/ProxySettings.java
+++ b/platform/o.n.core/src/org/netbeans/core/ProxySettings.java
@@ -49,6 +49,8 @@ public class ProxySettings {
public static final String USE_PROXY_ALL_PROTOCOLS = "useProxyAllProtocols"; // NOI18N
public static final String DIRECT = "DIRECT"; // NOI18N
public static final String PAC = "PAC"; // NOI18N
+ public static final String PAC_SCRIPT_TIMEOUT = "pacScriptTimeout"; // NOI18N
+ public static final int DEFAULT_TIMEOUT = 60000;
+ public static final int DEFAULT_TIMEOUT = 10000;

public static final String SYSTEM_PROXY_HTTP_HOST = "systemProxyHttpHost"; // NOI18N
public static final String SYSTEM_PROXY_HTTP_PORT = "systemProxyHttpPort"; // NOI18N
Expand Down
Loading