Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 81130 invoked from network); 8 Mar 2008 20:04:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Mar 2008 20:04:19 -0000 Received: (qmail 51230 invoked by uid 500); 8 Mar 2008 20:04:15 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 51148 invoked by uid 500); 8 Mar 2008 20:04:15 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 51137 invoked by uid 500); 8 Mar 2008 20:04:15 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 51134 invoked by uid 99); 8 Mar 2008 20:04:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Mar 2008 12:04:15 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Mar 2008 20:03:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C547E1A9832; Sat, 8 Mar 2008 12:03:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r635065 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Date: Sat, 08 Mar 2008 20:03:57 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080308200357.C547E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Sat Mar 8 12:03:54 2008 New Revision: 635065 URL: http://svn.apache.org/viewvc?rev=635065&view=rev Log: get jaxws stuff running under tomcat again! Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=635065&r1=635064&r2=635065&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Sat Mar 8 12:03:54 2008 @@ -253,14 +253,25 @@ if (transportInfo instanceof ServletBasedOutTransportInfo) { servletBasedOutTransportInfo = (ServletBasedOutTransportInfo) transportInfo; - List customHeaders = (List) msgContext.getProperty(HTTPConstants.HTTP_HEADERS); + Object customHeaders = msgContext.getProperty(HTTPConstants.HTTP_HEADERS); if (customHeaders != null) { - Iterator iter = customHeaders.iterator(); - while (iter.hasNext()) { - Header header = (Header) iter.next(); - if (header != null) { - servletBasedOutTransportInfo - .addHeader(header.getName(), header.getValue()); + if (customHeaders instanceof List) { + Iterator iter = ((List) customHeaders).iterator(); + while (iter.hasNext()) { + Header header = (Header) iter.next(); + if (header != null) { + servletBasedOutTransportInfo + .addHeader(header.getName(), header.getValue()); + } + } + } else if (customHeaders instanceof Map) { + Iterator iter = ((Map) customHeaders).entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry header = (Map.Entry) iter.next(); + if (header != null) { + servletBasedOutTransportInfo + .addHeader((String) header.getKey(), (String) header.getValue()); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org