[netbeans] branch master updated: Fix NPE if PAC cannot be resolved, e.g. UnknownHostException if the proxy url is configured but not reachable.

[matthiasblaesing]

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing 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 0bcf9fe  Fix NPE if PAC cannot be resolved, e.g. UnknownHostException 
if the proxy url is configured but not reachable.
     new eff347e  Merge pull request #1382 from akuhtz/fix-pac-npe
0bcf9fe is described below

commit 0bcf9fefe1012f1456446038f1645b3610e66b36
Author: Andreas Kuhtz <andreas.ku...@gmail.com>
AuthorDate: Mon Jul 15 21:27:48 2019 +0200

    Fix NPE if PAC cannot be resolved, e.g. UnknownHostException if the proxy 
url is configured but not reachable.
---
 .../src/org/netbeans/core/network/proxy/ProxyAutoConfig.java           | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/platform/core.network/src/org/netbeans/core/network/proxy/ProxyAutoConfig.java
 
b/platform/core.network/src/org/netbeans/core/network/proxy/ProxyAutoConfig.java
index 504a270..992e9c1 100644
--- 
a/platform/core.network/src/org/netbeans/core/network/proxy/ProxyAutoConfig.java
+++ 
b/platform/core.network/src/org/netbeans/core/network/proxy/ProxyAutoConfig.java
@@ -138,6 +138,9 @@ public class ProxyAutoConfig {
                 }
             }
         }
+        if (evaluator == null) {
+            return Collections.singletonList(Proxy.NO_PROXY);
+        }
         try {
             return evaluator.findProxyForURL(u);
         } catch (PacValidationException ex) {


---------------------------------------------------------------------
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