diff options
author | Simon Rettberg | 2023-04-06 16:51:09 +0200 |
---|---|---|
committer | Simon Rettberg | 2023-04-06 16:51:09 +0200 |
commit | 04bf71026ac60a4a1852f1d9c61185a96f8529b0 (patch) | |
tree | ea4569ce4ea57dfab5f4b51cd037be91f58dbbd5 /dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java | |
parent | [client] Completely change proxy detection code (diff) | |
download | tutor-module-04bf71026ac60a4a1852f1d9c61185a96f8529b0.tar.gz tutor-module-04bf71026ac60a4a1852f1d9c61185a96f8529b0.tar.xz tutor-module-04bf71026ac60a4a1852f1d9c61185a96f8529b0.zip |
[client] Use apache-http for version check
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java index 711915aa..29aa86bd 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java @@ -5,7 +5,6 @@ import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -17,10 +16,10 @@ import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; -import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.ssl.TLS; import org.apache.hc.core5.util.Timeout; import org.apache.logging.log4j.Level; @@ -256,8 +255,7 @@ public class ProxyConfigurator { httpGet.setHeader("Accept", "text/html, application/vnd.paos+xml"); httpGet.setHeader("PAOS", "ver=\"urn:liberty:paos:2003-08\";\"urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp\""); - try { - HttpResponse response = client.execute(httpGet); + try (CloseableHttpResponse response = client.execute(httpGet)) { LOGGER.debug("Master server replies with " + response.getCode()); int rc = response.getCode(); return rc >= 200 && rc < 300; |