You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sd...@apache.org on 2023/01/05 14:52:08 UTC
[netbeans] branch master updated: Strip protocol part, present e.g. if in KDE + manual proxy mode.
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 692dd8695c Strip protocol part, present e.g. if in KDE + manual proxy mode.
new 9ea17f3470 Merge pull request #5195 from sdedic/platform/proxy-compat-kde
692dd8695c is described below
commit 692dd8695c7d80cd6e195282095a16b7a1f128c2
Author: Svata Dedic <sv...@oracle.com>
AuthorDate: Wed Jan 4 12:36:43 2023 +0100
Strip protocol part, present e.g. if in KDE + manual proxy mode.
---
.../src/org/netbeans/core/network/proxy/NetworkProxySettings.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
index 420978f290..ca3f4705e4 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
@@ -157,6 +157,10 @@ public final class NetworkProxySettings {
if (string == null) {
return EMPTY_STRING;
} else {
+ // the proxy string may possibly contain protocol part - strip it.
+ if (string.contains("://")) { // NOI18N
+ string = string.substring(string.indexOf("://") + 3); // NOI18N
+ }
if (string.contains(COLON)) {
return string.substring(0, string.lastIndexOf(COLON));
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists