Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 81103 invoked from network); 15 Dec 2003 07:47:49 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 15 Dec 2003 07:47:49 -0000 Received: (qmail 74511 invoked by uid 500); 15 Dec 2003 07:47:24 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 74458 invoked by uid 500); 15 Dec 2003 07:47:24 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 74368 invoked by uid 500); 15 Dec 2003 07:47:22 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 74192 invoked from network); 15 Dec 2003 07:47:20 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 15 Dec 2003 07:47:20 -0000 Received: (qmail 80561 invoked by uid 1747); 15 Dec 2003 07:47:42 -0000 Date: 15 Dec 2003 07:47:42 -0000 Message-ID: <20031215074742.80560.qmail@minotaur.apache.org> From: tony@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation WebServiceProxyGenerator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N tony 2003/12/14 23:47:42 Modified: src/blocks/proxy/java/org/apache/cocoon/generation WebServiceProxyGenerator.java Log: fixed parameter named 'null' being added to request Revision Changes Path 1.5 +15 -2 cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java Index: WebServiceProxyGenerator.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- WebServiceProxyGenerator.java 25 Sep 2003 19:59:24 -0000 1.4 +++ WebServiceProxyGenerator.java 15 Dec 2003 07:47:42 -0000 1.5 @@ -228,7 +228,14 @@ String submitQryString = method.getQueryString(); // set final web service query string - method.setQueryString(urlQryString + "&" + submitQryString); + + // sometimes the querystring is null here... + if (null == urlQryString) { + method.setQueryString(submitQryString); + } else { + method.setQueryString(urlQryString + "&" + submitQryString); + } + } // if there are submit parameters byte[] response = null; @@ -280,6 +287,12 @@ config = new HostConfiguration(); } + + /* TODO: fixme! + * When the specified source sent to the wsproxy is not "http" + * (e.g. "cocoon:/"), the HttpClient throws an exception. Does the source + * here need to be resolved before being set in the HostConfiguration? + */ try { uri = new URI(this.source); host = uri.getHost();