[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit WebConversation.java,1.31,1.32

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1:/tmp/cvs-serv2570/src/com/meterware/httpunit

Modified Files:
	WebConversation.java 
Log Message:
Use request URL to select cookies, not connection URL

Index: WebConversation.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebConversation.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WebConversation.java	20 Mar 2003 15:21:57 -0000	1.31
+++ WebConversation.java	23 Mar 2003 01:43:15 -0000	1.32
@@ -55,7 +55,8 @@
      **/
     protected WebResponse newResponse( WebRequest request, String frameName ) throws MalformedURLException, IOException {
         URLConnection connection = openConnection( getRequestURL( request ) );
-	    sendHeaders( connection, request.getHeaderDictionary() );
+        sendHeaders( connection, getHeaderFields( request.getURL() ) );
+        sendHeaders( connection, request.getHeaderDictionary() );
         request.completeRequest( connection );
         return new HttpWebResponse( this, frameName, request.getURL(), connection, getExceptionsThrownOnErrorStatus() );
     }
@@ -80,13 +81,7 @@
         URLConnection connection = url.openConnection();
         if (connection instanceof HttpURLConnection) ((HttpURLConnection) connection).setInstanceFollowRedirects( false );
         connection.setUseCaches( false );
-        sendHeaders( connection );
         return connection;
-    }
-
-
-    private void sendHeaders( URLConnection connection ) {
-        sendHeaders( connection, getHeaderFields( connection.getURL() ) );
     }