From 3bf2eae97df480ac5280a5563d3c9870ff952166 Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 25 Sep 2015 13:47:17 -0500 Subject: [PATCH] Does not store global proxy config if no server or port is entered. --- .../GlobalProxyConfigForm.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java index b4ab276c8..8c9e53f23 100644 --- a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java +++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java @@ -342,17 +342,28 @@ private void saveValues() } else { + // If there is no proxy server address or port entered skip the + // configuration, otherwise it can lead to unusable state of the + // providers with only proxy type setting and no server + // or port + String serverAddress = serverAddressField.getText(); + String port = portField.getText(); + + if(serverAddress == null || serverAddress.length() == 0 + || port == null || port.length() == 0) + { + return; + } + configService.setProperty( - ProxyInfo.CONNECTION_PROXY_TYPE_PROPERTY_NAME, - ((ProxyInfo.ProxyType)typeCombo.getSelectedItem()).name()); + ProxyInfo.CONNECTION_PROXY_TYPE_PROPERTY_NAME, + ((ProxyInfo.ProxyType)typeCombo.getSelectedItem()).name()); - String serverAddress = serverAddressField.getText(); if(serverAddress != null && serverAddress.length() > 0) configService.setProperty( ProxyInfo.CONNECTION_PROXY_ADDRESS_PROPERTY_NAME, serverAddress); - String port = portField.getText(); if(port != null && port.length() > 0) configService.setProperty( ProxyInfo.CONNECTION_PROXY_PORT_PROPERTY_NAME, port);