svn commit: r585529 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java

[se...@apache.org]

Author: sebb
Date: Wed Oct 17 07:58:49 2007
New Revision: 585529

URL: http://svn.apache.org/viewvc?rev=585529&view=rev
Log:
Name clash

Modified:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=585529&r1=585528&r2=585529&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Wed Oct 17 07:58:49 2007
@@ -99,22 +99,22 @@
     /**
      * Configure the Proxy.
      * 
-     * @param clientSocket
+     * @param _clientSocket
      *            the socket connection to the client
-     * @param target
+     * @param _target
      *            the ProxyControl which will receive the generated sampler
-     * @param pageEncodings
+     * @param _pageEncodings
      *            reference to the Map of Deamon, with mappings from page urls to encoding used
      * @param formEncodingsEncodings
      *            reference to the Map of Deamon, with mappings from form action urls to encoding used
      */
-    void configure(Socket clientSocket, ProxyControl target, Map pageEncodings, Map formEncodings) {
-        this.target = target;
-        this.clientSocket = clientSocket;
-        this.captureHttpHeaders = target.getCaptureHttpHeaders();
-        this.httpsSpoof = target.getHttpsSpoof();
-        this.pageEncodings = pageEncodings;
-        this.formEncodings = formEncodings;
+    void configure(Socket _clientSocket, ProxyControl _target, Map _pageEncodings, Map _formEncodings) {
+        this.target = _target;
+        this.clientSocket = _clientSocket;
+        this.captureHttpHeaders = _target.getCaptureHttpHeaders();
+        this.httpsSpoof = _target.getHttpsSpoof();
+        this.pageEncodings = _pageEncodings;
+        this.formEncodings = _formEncodings;
     }
 
 	/**



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org