#2209 reset ProxySelector when exit plugin

microsoft · Feb 2, 2023 · 2e34ecd · 2e34ecd
1 parent 4d7de5f
commit 2e34ecd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/azure-maven-plugin-lib/src/main/java/com/microsoft/azure/maven/AbstractAzureMojo.java b/azure-maven-plugin-lib/src/main/java/com/microsoft/azure/maven/AbstractAzureMojo.java
@@ -321,6 +321,7 @@ public void execute() throws MojoExecutionException {
             } catch (InterruptedException e) {
                 // swallow this exception
             }
+            ProxyManager.getInstance().resetProxy();
             ApacheSenderFactory.INSTANCE.create().close();
         }
     }

diff --git a/...t-common-lib/src/main/java/com/microsoft/azure/toolkit/lib/common/proxy/ProxyManager.java b/...t-common-lib/src/main/java/com/microsoft/azure/toolkit/lib/common/proxy/ProxyManager.java
@@ -30,6 +30,7 @@ public class ProxyManager {
     // isSystemProxyUnset shows whether user specify the proxy through -Djava.net.useSystemProxies
     // see: https://docs.oracle.com/javase/8/docs/technotes/guides/net/proxies.html
     private static final boolean isSystemProxyUnset = StringUtils.isBlank(System.getProperty(PROPERTY_USE_SYSTEM_PROXY));
+    private final ProxySelector defaultProxySelector = ProxySelector.getDefault();
 
     public boolean isProxyEnabled() {
         return StringUtils.isNotBlank(Azure.az().config().getProxySource());
@@ -95,6 +96,10 @@ public PasswordAuthentication getPasswordAuthentication() {
         }
     }
 
+    public void resetProxy() {
+        ProxySelector.setDefault(this.defaultProxySelector);
+    }
+
     private ProxyInfo getSystemProxy() {
         // we need to init at the program start before any internet access
         if (isSystemProxyUnset) {