Author: shawkins
Date: 2010-05-03 13:07:09 -0400 (Mon, 03 May 2010)
New Revision: 2091
Modified:
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooManagedConnectionFactory.java
Log:
removing bad proxy logic from the yahoo connector
Modified:
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java
===================================================================
---
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java 2010-05-03
01:14:25 UTC (rev 2090)
+++
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java 2010-05-03
17:07:09 UTC (rev 2091)
@@ -74,9 +74,6 @@
int returnIndex = 0;
private Select query;
- private String previousHttpProxyHost;
- private String previousHttpProxyPort;
-
/**
*
*/
@@ -145,8 +142,6 @@
BufferedReader buffReader = null;
try {
- setProxy();
-
// create the URL object
URL url = new URL(yahooUrl);
@@ -179,7 +174,6 @@
} finally {
buffReader = null;
inSR = null;
- resetProxy();
}
return rows;
@@ -301,29 +295,4 @@
}
- private void setProxy() {
- String proxyHost = this.config.getHttpProxyHost();
- String proxyPort = this.config.getHttpProxyPort();
-
- previousHttpProxyHost = System.getProperty(JAVA_PROP_HTTP_PROXY_HOST);
- previousHttpProxyPort = System.getProperty(JAVA_PROP_HTTP_PROXY_PORT);
-
- if(proxyHost != null) {
- System.setProperty(JAVA_PROP_HTTP_PROXY_HOST, proxyHost);
- if(proxyPort == null) {
-
this.config.getLogger().logWarning(YahooPlugin.Util.getString("YahooConnector.proxyPortNotSet"));//$NON-NLS-1$
- }else {
- System.setProperty(JAVA_PROP_HTTP_PROXY_PORT, proxyPort);
- }
- }
- }
-
- private void resetProxy() {
- if(previousHttpProxyHost != null) {
- System.setProperty(JAVA_PROP_HTTP_PROXY_HOST, previousHttpProxyHost);
- }
- if(previousHttpProxyPort != null) {
- System.setProperty(JAVA_PROP_HTTP_PROXY_PORT, previousHttpProxyPort);
- }
- }
}
Modified:
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooManagedConnectionFactory.java
===================================================================
---
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooManagedConnectionFactory.java 2010-05-03
01:14:25 UTC (rev 2090)
+++
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooManagedConnectionFactory.java 2010-05-03
17:07:09 UTC (rev 2091)
@@ -27,24 +27,4 @@
private static final long serialVersionUID = -8938107803750844843L;
- private String httpProxyHost;
- private String httpProxyPort;
-
- public String getHttpProxyHost() {
- return httpProxyHost;
- }
-
- public void setHttpProxyHost(String httpProxyHost) {
- this.httpProxyHost = httpProxyHost;
- }
-
- public String getHttpProxyPort() {
- return httpProxyPort;
- }
-
- public void setHttpProxyPort(String httpProxyPort) {
- this.httpProxyPort = httpProxyPort;
- }
-
-
}
Show replies by date