Author: veithen
Date: Fri Jun 5 07:35:43 2009
New Revision: 781932
URL: http://svn.apache.org/viewvc?rev=781932&view=rev
Log:
Fixed an issue with outgoing proxy support.
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java?rev=781932&r1=781931&r2=781932&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java
Fri Jun 5 07:35:43 2009
@@ -88,7 +88,13 @@
if (requestResponseListener != null) {
requestResponseListener.setTarget(host, port);
}
- outSocket = config.getSocketFactory().createSocket(host, port);
+ SocketFactory sf = config.getSocketFactory();
+ String httpProxyHost = config.getHttpProxyHost();
+ if (httpProxyHost != null) {
+ outSocket = sf.createSocket(httpProxyHost,
config.getHttpProxyPort());
+ } else {
+ outSocket = sf.createSocket(host, port);
+ }
tmpOut2 = outSocket.getOutputStream();
requestTee.setOutputStream(tmpOut2);
}
@@ -99,9 +105,6 @@
public void run() {
try {
active = true;
- String HTTPProxyHost = config.getHttpProxyHost();
- int HTTPProxyPort = config.getHttpProxyPort();
- final SocketFactory socketFactory = config.getSocketFactory();
String targetHost = config.getTargetHost();
if (listener != null) {
requestResponseListener =
listener.createRequestResponseListener(inSocket.getInetAddress().getHostName());
@@ -140,9 +143,8 @@
requestPipeline.addFilter(new Tee(requestOutputStream));
}
}
- if (HTTPProxyHost != null) {
+ if (config.getHttpProxyHost() != null) {
requestFilter.addHandler(new
HttpProxyClientHandler(targetHost, targetPort));
- outSocket = socketFactory.createSocket(HTTPProxyHost,
HTTPProxyPort);
}
ChainedContentFilterFactory requestContentFilterFactory = new
ChainedContentFilterFactory();
if (config.getRequestContentFilterFactory() != null) {
