You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2004/05/11 15:36:35 UTC
cvs commit: ws-axis/java/src/org/apache/axis/transport/http CommonsHTTPSender.java
dims 2004/05/11 06:36:35
Modified: java/src/org/apache/axis/transport/http
CommonsHTTPSender.java
Log:
Fix for (AXIS-1356) CommonsHTTPSender NPE when proxy is set
from Dominik Westner
Revision Changes Path
1.23 +3 -3 ws-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java
Index: CommonsHTTPSender.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CommonsHTTPSender.java 12 Mar 2004 07:34:00 -0000 1.22
+++ CommonsHTTPSender.java 11 May 2004 13:36:35 -0000 1.23
@@ -278,9 +278,9 @@
if (port == -1) {
port = 80; // even for https
}
- if (tcp.getProxyHost().length() == 0 ||
- tcp.getProxyPort().length() == 0 ||
- hostInNonProxyList) {
+ if (tcp.getProxyHost().length() > 0 &&
+ tcp.getProxyPort().length() > 0 &&
+ !hostInNonProxyList) {
config.setHost(targetURL.getHost(), port, targetURL.getProtocol());
} else {
if (tcp.getProxyUser().length() != 0) {