cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient HttpMethodBase.java

[morgand]

morgand     01/07/17 12:57:09

  Modified:    httpclient/src/java/org/apache/commons/httpclient
                        HttpMethodBase.java
  Log:
  changed behaviour of GETs, so that input to setQueryString and setParameter
  is automatically combined
  
  Revision  Changes    Path
  1.6       +14 -5     
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java
  
  Index: HttpMethodBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HttpMethodBase.java       2001/06/20 15:58:14     1.5
  +++ HttpMethodBase.java       2001/07/17 19:57:08     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
 1.5 2001/06/20 15:58:14 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/06/20 15:58:14 $
  + * $Header: 
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
 1.6 2001/07/17 19:57:08 morgand Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/07/17 19:57:08 $
    *
    * ====================================================================
    *
  @@ -532,7 +532,16 @@
                   requestString += "?";
               }
               requestString += queryString;
  -        } else if (!parameters.isEmpty()) {
  +        }
  +        
  +        // append parameters, even if the query string
  +        // has been set
  +        if (!parameters.isEmpty()) {
  +
  +            if (queryString.indexOf("?") < 0) {
  +                requestString += "?";
  +            }
  +
               // Parsing parameters list
               StringBuffer parametersString = new StringBuffer();
               Enumeration paramNames = parameters.keys();
  @@ -546,7 +555,7 @@
                       parametersString.append("&");
                   }
               }
  -            requestString = requestString + "?" + parametersString.toString();
  +            requestString += parametersString.toString();
           }
   
           return (getName() + " " + requestString + " " + PROTOCOL + "\r\n");