Changeset 3093

Timestamp:

01/23/12 15:19:20 (4 months ago)

Author:

kasper

Message:

Fixed minor issue when userpreferences indicate that proxy is enabled, but no hostname+port has been specified.

File:

• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/util/HttpXmlUtils.java (modified) (1 diff)

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/util/HttpXmlUtils.java

@@ -92 +92 @@
                         final int proxyPort = _userPreferences.getProxyPort();
 
-                        final HttpHost proxy = new HttpHost(proxyHostname, proxyPort);
-                        httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+                        try {
+                                final HttpHost proxy = new HttpHost(proxyHostname, proxyPort);
+                                httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
 
-                        if (_userPreferences.isProxyAuthenticationEnabled()) {
-                                final AuthScope authScope = new AuthScope(proxyHostname, proxyPort);
-                                final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
-                                                _userPreferences.getProxyUsername(), _userPreferences.getProxyPassword());
-                                httpClient.getCredentialsProvider().setCredentials(authScope, credentials);
+                                if (_userPreferences.isProxyAuthenticationEnabled()) {
+                                        final AuthScope authScope = new AuthScope(proxyHostname, proxyPort);
+                                        final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
+                                                        _userPreferences.getProxyUsername(), _userPreferences.getProxyPassword());
+                                        httpClient.getCredentialsProvider().setCredentials(authScope, credentials);
+                                }
+                        } catch (Exception e) {
+                                // ignore proxy creation and return http client without it
+                                logger.error("Unexpected error occurred while initializing HTTP proxy", e);
                         }
                 }