rlubke      2002/06/13 05:47:23

  Modified:    src/tools/org/apache/watchdog/task GTest.java
  Log:
  Modified logic to send duplicate headers as one aggregated header vs. two headers:
  
    header1: val1
    header1: val2
  
     -will now be-
  
    header1: val1, val2
  
  Revision  Changes    Path
  1.9       +18 -10    
jakarta-watchdog-4.0/src/tools/org/apache/watchdog/task/GTest.java
  
  Index: GTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-watchdog-4.0/src/tools/org/apache/watchdog/task/GTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- GTest.java        4 Apr 2002 17:24:15 -0000       1.8
  +++ GTest.java        13 Jun 2002 12:47:23 -0000      1.9
  @@ -951,22 +951,30 @@
           if ( debug > 0 ) {
               System.out.println( " REQUEST: " + request );
           }
  -        reqbuf.append( request ).append( CRLF );;
  +        reqbuf.append( request ).append( CRLF );
   
  -        // append all rquest headers 
  +        // append all request headers 
           if ( !requestHeaders.isEmpty() ) {
               Iterator iter = requestHeaders.keySet().iterator();
  -             
  +                     
               while ( iter.hasNext() ) {
  +                StringBuffer tmpBuf = new StringBuffer(32);
                   String headerKey = ( String ) iter.next();
                        ArrayList values = (ArrayList) requestHeaders.get( headerKey );
                        String[] value = (String[]) values.toArray( new String[ 
values.size() ] );
  +                tmpBuf.append( headerKey ).append(": ");
                        for ( int i = 0; i < value.length; i++ ) {
  -                             reqbuf.append( headerKey ).append( ": " ).append( 
value[ i ] ).append( CRLF );
  -                             if ( debug > 0 ) {
  -                                 System.out.println( " REQUEST HEADER: " + 
headerKey + ": " + value[ i ] );
  -                             }
  +                    if ((i + 1) == value.length) {
  +                                 tmpBuf.append( value[ i ] );
  +                    } else {
  +                        tmpBuf.append( value[ i ] ).append(", ");
  +                    }
                        }
  +                         if ( debug > 0 ) {
  +                             System.out.println( " REQUEST HEADER: " + 
tmpBuf.toString());
  +                         }
  +                tmpBuf.append( CRLF );
  +                reqbuf.append(tmpBuf.toString());
               }
           }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to