svn commit: r1043892 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java

[se...@apache.org]

Author: sebb
Date: Thu Dec  9 11:06:13 2010
New Revision: 1043892

URL: http://svn.apache.org/viewvc?rev=1043892&view=rev
Log:
Simplify

Modified:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1043892&r1=1043891&r2=1043892&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Thu Dec  9 11:06:13 2010
@@ -57,10 +57,8 @@ import org.apache.commons.httpclient.met
 import org.apache.commons.httpclient.methods.multipart.Part;
 import org.apache.commons.httpclient.methods.multipart.PartBase;
 import org.apache.commons.httpclient.methods.multipart.StringPart;
-import org.apache.commons.httpclient.params.DefaultHttpParams;
 import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.jmeter.protocol.http.control.AuthManager;
 import org.apache.jmeter.protocol.http.control.Authorization;
@@ -89,8 +87,6 @@ public class HTTPHC3Impl extends HTTPHCA
 
     private static final long serialVersionUID = 240L;
 
-    private static final String HTTP_AUTHENTICATION_PREEMPTIVE = "http.authentication.preemptive"; // $NON-NLS-1$
-
     private static final boolean canSetPreEmptive; // OK to set pre-emptive auth?
 
     private static final ThreadLocal<Map<HostConfiguration, HttpClient>> httpClients = 
@@ -125,7 +121,7 @@ public class HTTPHC3Impl extends HTTPHCA
 //        }
 
         // Set default parameters as needed
-        HttpParams params = DefaultHttpParams.getDefaultParams();
+        HttpClientParams params = new HttpClientParams();
 
         // Process httpclient parameters file
         String file=JMeterUtils.getProperty("httpclient.parameters.file"); // $NON-NLS-1$
@@ -133,9 +129,9 @@ public class HTTPHC3Impl extends HTTPHCA
             HttpClientDefaultParameters.load(file,params);
         }
 
-        // If the pre-emptive parameter is undefined, then we cans set it as needed
+        // If the pre-emptive parameter is undefined, then we can set it as needed
         // otherwise we should do what the user requested.
-        canSetPreEmptive =  params.getParameter(HTTP_AUTHENTICATION_PREEMPTIVE) == null;
+        canSetPreEmptive =  params.isAuthenticationPreemptive();
 
         // Handle old-style JMeter properties
         // Default to HTTP version 1.1



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