You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2010/02/23 17:09:13 UTC

svn commit: r915405 [3/3] - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/assertions/gui/ components/org/apache/jmeter/config/ components/org/apache/jmeter/control/ components/org/apache/jmeter/extr...

Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java (original)
+++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java Tue Feb 23 16:09:09 2010
@@ -88,7 +88,7 @@
         c.setProperty(CONNECTOR_PREFIX,prefixField.getText(),CONNECTOR_PREFIX_DEFAULT);
         model.setPrefix(prefixField.getText());
     }
-    
+
     private void initModel() {
         model = new MonitorAccumModel();
         graph = new MonitorGraph(model);

Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java (original)
+++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java Tue Feb 23 16:09:09 2010
@@ -24,7 +24,7 @@
  *  TODO - convert this into an immutable class using plain variables
  *  The current implementation is quite inefficient, as it stores everything
  *  in properties.
- *  
+ *
  *  This will require changes to ResultCollector.recordStats()
  *  and SaveService.saveTestElement() which are both currently only used by Monitor classes
  */

Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java Tue Feb 23 16:09:09 2010
@@ -29,7 +29,7 @@
 public class ObjectFactory {
 
     private static class ObjectFactoryHolder {
-        static final ObjectFactory FACTORY = new ObjectFactory();    
+        static final ObjectFactory FACTORY = new ObjectFactory();
       }
 
     private final Parser PARSER;

Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java Tue Feb 23 16:09:09 2010
@@ -22,7 +22,7 @@
     void setJvm(Jvm vm);
 
     java.util.List<Connector> getConnector();
-    
+
     void addConnector(Connector conn);
 
     void setConnectorPrefix(String prefix);

Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java Tue Feb 23 16:09:09 2010
@@ -25,7 +25,7 @@
  */
 public class StatusImpl implements Status {
     private Jvm jvm = null;
-    
+
     private String connectorPrefix = null;
 
     private final List<Connector> connectors;

Modified: jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Tue Feb 23 16:09:09 2010
@@ -75,7 +75,7 @@
     public final static String SAVE_RESPONSE = "FTPSampler.saveresponse"; // $NON-NLS-1$
 
     private volatile FTPClient savedClient;
-    
+
     public FTPSampler() {
     }
 
@@ -179,7 +179,7 @@
             savedClient = ftp;
             final int port = getPortAsInt();
             if (port > 0){
-                ftp.connect(getServer(),port);                
+                ftp.connect(getServer(),port);
             } else {
                 ftp.connect(getServer());
             }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Tue Feb 23 16:09:09 2010
@@ -71,9 +71,9 @@
     private JTextField proxyPass;
 
     private JTextField connectTimeOut;
-    
+
     private JTextField responseTimeOut;
-    
+
     private JTextField protocol;
 
     private JTextField contentEncoding;
@@ -226,7 +226,7 @@
 
     /**
      * Create a panel containing the webserver (domain+port) and timeouts (connect+request).
-     * 
+     *
      * @return the panel
      */
     protected final JPanel getWebServerTimeoutPanel() {
@@ -238,7 +238,7 @@
         final JPanel portPanel = getPortPanel();
         webServerPanel.add(domainPanel, BorderLayout.CENTER);
         webServerPanel.add(portPanel, BorderLayout.EAST);
-        
+
         JPanel timeOut = new HorizontalPanel();
         timeOut.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("web_server_timeout_title"))); // $NON-NLS-1$
@@ -246,11 +246,11 @@
         final JPanel reqPanel = getResponseTimeOutPanel();
         timeOut.add(connPanel);
         timeOut.add(reqPanel);
-                
+
         JPanel webServerTimeoutPanel = new VerticalPanel();
         webServerTimeoutPanel.add(webServerPanel, BorderLayout.CENTER);
         webServerTimeoutPanel.add(timeOut, BorderLayout.EAST);
-        
+
         JPanel bigPanel = new VerticalPanel();
         bigPanel.add(webServerTimeoutPanel);
         return bigPanel;
@@ -258,25 +258,25 @@
 
     /**
      * Create a panel containing the proxy server details
-     * 
+     *
      * @return the panel
      */
     protected final JPanel getProxyServerPanel(){
         JPanel proxyServer = new HorizontalPanel();
         proxyServer.add(getProxyHostPanel(), BorderLayout.CENTER);
         proxyServer.add(getProxyPortPanel(), BorderLayout.EAST);
-        
+
         JPanel proxyLogin = new HorizontalPanel();
         proxyLogin.add(getProxyUserPanel());
         proxyLogin.add(getProxyPassPanel());
-                
+
         JPanel proxyServerPanel = new HorizontalPanel();
         proxyServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("web_proxy_server_title"))); // $NON-NLS-1$
         proxyServerPanel.add(proxyServer, BorderLayout.CENTER);
         proxyServerPanel.add(proxyLogin, BorderLayout.EAST);
-        
-        return proxyServerPanel;        
+
+        return proxyServerPanel;
     }
 
     private JPanel getPortPanel() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java Tue Feb 23 16:09:09 2010
@@ -55,11 +55,11 @@
     public static final String CLEAR = "clearEachIteration"; // $NON-NLS-1$
     public static final String USE_EXPIRES = "useExpires"; // $NON-NLS-1$
     //-
-    
+
     private transient ThreadLocal<Map<String, CacheEntry>> threadCache;
 
     private transient boolean useExpires; // Cached value
-    
+
     public CacheManager() {
         setProperty(new BooleanProperty(CLEAR, false));
         setProperty(new BooleanProperty(USE_EXPIRES, false));

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Tue Feb 23 16:09:09 2010
@@ -79,7 +79,7 @@
 
     private static final String COOKIE_NAME_PREFIX =
         JMeterUtils.getPropDefault("CookieManager.name.prefix", "COOKIE_").trim();// $NON-NLS-1$ $NON-NLS-2$
-    
+
     private static final boolean SAVE_COOKIES =
         JMeterUtils.getPropDefault("CookieManager.save.cookies", false);// $NON-NLS-1$
 

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Tue Feb 23 16:09:09 2010
@@ -76,7 +76,7 @@
 
     /**
      * Get the collection of JMeterProperty entries representing the headers.
-     * 
+     *
      * @return the header collection property
      */
     public CollectionProperty getHeaders() {
@@ -269,17 +269,17 @@
     /**
      * Merge the attributes with a another HeaderManager's attributes.
      * @param element The object to be merged with
-     * @param preferLocalValues When both objects have a value for the 
-     *        same attribute, this flag determines which value is preferresd. 
+     * @param preferLocalValues When both objects have a value for the
+     *        same attribute, this flag determines which value is preferresd.
      */
     public HeaderManager merge(TestElement element, boolean preferLocalValues) {
         if (!(element instanceof HeaderManager)) {
             throw new IllegalArgumentException("Cannot merge type:" + this.getClass().getName() + " with type:" + element.getClass().getName());
         }
-        
+
         // start off with a merged object as a copy of the local object
         HeaderManager merged = (HeaderManager)this.clone();
-        
+
         HeaderManager other = (HeaderManager)element;
         // iterate thru each of the other headers
         for (int i = 0; i < other.getHeaders().size(); i++) {
@@ -310,10 +310,10 @@
                 merged.add(otherHeader);
             }
         }
-        
+
         // finally, merge the names so it's clear they've been merged
         merged.setName(merged.getName() + ":" + other.getName());
-        
+
         return merged;
     }
 }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java Tue Feb 23 16:09:09 2010
@@ -42,7 +42,7 @@
     public String getStaticLabel() {
         return JMeterUtils.getResString("ajp_sampler_title"); // $NON-NLS-1$
     }
-    
+
     @Override
     public String getDocAnchor() {// reuse documentation
         return super.getStaticLabel().replace(' ', '_'); //$NON-NLS-1$ //$NON-NLS-2$

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java Tue Feb 23 16:09:09 2010
@@ -32,9 +32,9 @@
  * HTTP Sampler GUI for Apache HTTPClient HTTP implementation
  */
 public class HttpTestSampleGui2 extends HttpTestSampleGui {
-    
+
     private static final long serialVersionUID = 240L;
-    
+
     private JLabeledTextField sourceIpAddr;
 
     public HttpTestSampleGui2() {
@@ -79,10 +79,10 @@
         sourceIpAddr = new JLabeledTextField(JMeterUtils
                 .getResString("web_testing2_source_ip")); // $NON-NLS-1$
         optionalTasksPanel.add(sourceIpAddr, BorderLayout.EAST);
-        
+
         return optionalTasksPanel;
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java Tue Feb 23 16:09:09 2010
@@ -164,7 +164,7 @@
 
     /**
      * Save the GUI data in the HTTPSamplerBase element.
-     * 
+     *
      * @param testElement
      */
     public void modifyTestElement(TestElement testElement) {
@@ -198,7 +198,7 @@
             tableModel.clearData();
             HTTPFileArg[] files = base.getHTTPFiles();
             for(int i=0; i< files.length; i++){
-                tableModel.addRow(files[i]);            
+                tableModel.addRow(files[i]);
             }
             checkDeleteAndBrowseStatus();
         }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java Tue Feb 23 16:09:09 2010
@@ -253,7 +253,7 @@
     public static String formNotImplemented(String reason) {
         return formError("501 Method not implemented", "Service not implemented. " + reason);
     }
-    
+
     /**
      * Server is overloaded, client should try again latter.
      *

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Tue Feb 23 16:09:09 2010
@@ -94,7 +94,7 @@
      * Http Request method, uppercased, e.g. GET or POST.
      */
     private String method = ""; // $NON-NLS-1$
-    
+
     /** CONNECT url. */
     private String paramHttps = ""; // $NON-NLS-1$
 
@@ -207,7 +207,7 @@
         // SSL connection
         if (getMethod().startsWith(HTTPConstants.CONNECT)) {
             paramHttps = url;
-        } 
+        }
         if (url.startsWith("/")) {
             url = HTTPS + "://" + paramHttps + url; // $NON-NLS-1$
         }
@@ -237,8 +237,8 @@
         Iterator<String> keys = headers.keySet().iterator();
         while (keys.hasNext()) {
             String key = keys.next();
-            if (!key.equals(PROXY_CONNECTION) 
-             && !key.equals(CONTENT_LENGTH) 
+            if (!key.equals(PROXY_CONNECTION)
+             && !key.equals(CONTENT_LENGTH)
              && !key.equalsIgnoreCase(HTTPConstants.HEADER_CONNECTION)) {
                 manager.add(headers.get(key));
             }
@@ -557,7 +557,7 @@
     public String getUrl(){
         return url;
     }
-    
+
     /**
      * Returns the method string extracted from the first line of the client request.
      *

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=915405&r1=915404&r2=915405&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 Tue Feb 23 16:09:09 2010
@@ -81,29 +81,29 @@
     private static final String PROXY_HEADERS_REMOVE_DEFAULT = "If-Modified-Since,If-None-Match,Host"; // $NON-NLS-1$
 
     private static final String PROXY_HEADERS_REMOVE_SEPARATOR = ","; // $NON-NLS-1$
-    
+
     // for ssl connection
-    private static final String KEYSTORE_TYPE = 
+    private static final String KEYSTORE_TYPE =
         JMeterUtils.getPropDefault("proxy.cert.type", "JKS"); // $NON-NLS-1$ $NON-NLS-2$
-    
+
     private static final String KEYMANAGERFACTORY =
         JMeterUtils.getPropDefault("proxy.cert.factory", "SunX509"); // $NON-NLS-1$ $NON-NLS-2$
-    
-    private static final String SSLCONTEXT_PROTOCOL = 
+
+    private static final String SSLCONTEXT_PROTOCOL =
         JMeterUtils.getPropDefault("proxy.ssl.protocol", "SSLv3"); // $NON-NLS-1$ $NON-NLS-2$
-    
+
     // HashMap to save ssl connection between Jmeter proxy and browser
     private static final HashMap<String, SSLSocketFactory> hashHost = new HashMap<String, SSLSocketFactory>();
-    
+
     // Proxy configuration SSL
     private static final String CERT_DIRECTORY =
         JMeterUtils.getPropDefault("proxy.cert.directory", JMeterUtils.getJMeterBinDir()); // $NON-NLS-1$
-    
+
     private static final String CERT_FILE_DEFAULT = "proxyserver.jks";// $NON-NLS-1$
 
     private static final String CERT_FILE =
         JMeterUtils.getPropDefault("proxy.cert.file", CERT_FILE_DEFAULT); // $NON-NLS-1$
-    
+
     private static final char[] KEYSTORE_PASSWORD =
         JMeterUtils.getPropDefault("proxy.cert.keystorepass", "password").toCharArray(); // $NON-NLS-1$ $NON-NLS-2$
 
@@ -112,7 +112,7 @@
 
     // Use with SSL connection
     private OutputStream outStreamClient = null;
-    
+
     static {
         String removeList = JMeterUtils.getPropDefault(PROXY_HEADERS_REMOVE,PROXY_HEADERS_REMOVE_DEFAULT);
         headersToRemove = JOrphanUtils.split(removeList,PROXY_HEADERS_REMOVE_SEPARATOR);
@@ -149,7 +149,7 @@
      * Intended to be called directly after construction.
      * Should not be called after it has been passed to a new thread,
      * otherwise the variables may not be published correctly.
-     * 
+     *
      * @param _clientSocket
      *            the socket connection to the client
      * @param _target
@@ -189,11 +189,11 @@
         SampleResult result = null;
         HeaderManager headers = null;
 
-        try {   
+        try {
             // Now, parse only first line
             request.parse(new BufferedInputStream(clientSocket.getInputStream()));
             outStreamClient = clientSocket.getOutputStream();
-            
+
             if ((request.getMethod().startsWith(HTTPConstants.CONNECT)) && (outStreamClient != null)) {
                 log.debug("Method CONNECT => SSL");
                 // write a OK reponse to browser, to engage SSL exchange
@@ -210,7 +210,7 @@
                 // Re-parse (now it's the http request over SSL)
                 request.parse(new BufferedInputStream(clientSocket.getInputStream()));
             }
-            
+
             // Populate the sampler. It is the same sampler as we sent into
             // the constructor of the HttpRequestHdr instance above
             request.getSampler(pageEncodings, formEncodings);
@@ -308,13 +308,13 @@
             sampler.threadFinished(); // Needed for HTTPSampler2
         }
     }
-    
+
     /**
      * Get SSL connection from hashmap, creating it if necessary.
-     * 
+     *
      * @param host
      * @return a ssl socket factory
-     * @throws IOException 
+     * @throws IOException
      */
     private SSLSocketFactory getSSLSocketFactory(String host) throws IOException {
         synchronized (hashHost) {
@@ -364,7 +364,7 @@
 
     /**
      * Negotiate a SSL connection.
-     * 
+     *
      * @param sock socket in
      * @param host
      * @return a new client socket over ssl
@@ -375,7 +375,7 @@
         SSLSocket secureSocket;
         if (sslFactory != null) {
             try {
-                secureSocket = (SSLSocket) sslFactory.createSocket(sock, 
+                secureSocket = (SSLSocket) sslFactory.createSocket(sock,
                         sock.getInetAddress().getHostName(), sock.getPort(), true);
                 secureSocket.setUseClientMode(false);
                 if (log.isDebugEnabled()){
@@ -391,10 +391,10 @@
             throw new IOException("Unable to negotiate SSL transaction, no keystore?");
         }
     }
-    
+
     /**
      * Open the local certificate file.
-     * 
+     *
      * @return stream to key cert; null if there was a problem opening it
      */
     private InputStream getCertificate() {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Tue Feb 23 16:09:09 2010
@@ -81,9 +81,9 @@
 
     private static final String ASSERTION_GUI = AssertionGui.class.getName();
 
-    
+
     private static final String TRANSACTION_CONTROLLER_GUI = TransactionControllerGui.class.getName();
-    
+
     private static final String LOGIC_CONTROLLER_GUI = LogicControllerGui.class.getName();
 
     private static final String HEADER_PANEL = HeaderPanel.class.getName();
@@ -779,7 +779,7 @@
                 sampler.setImageParser(true);
             }
 
-            if (groupingMode == GROUPING_IN_SIMPLE_CONTROLLERS || 
+            if (groupingMode == GROUPING_IN_SIMPLE_CONTROLLERS ||
             		groupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
                 // Find the last controller in the target to store the
                 // sampler there:

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Tue Feb 23 16:09:09 2010
@@ -42,21 +42,21 @@
 /**
  * Selector for the AJP/1.3 protocol
  * (i.e. what Tomcat uses with mod_jk)
- * It allows you to test Tomcat in AJP mode without 
- * actually having Apache installed and configured 
+ * It allows you to test Tomcat in AJP mode without
+ * actually having Apache installed and configured
  *
  */
 public class AjpSampler extends HTTPSamplerBase {
 
     private static final long serialVersionUID = 233L;
 
-    private static final Logger log= LoggingManager.getLoggerForClass(); 
+    private static final Logger log= LoggingManager.getLoggerForClass();
 
     private static final char NEWLINE = '\n';
     private static final String COLON_SPACE = ": ";//$NON-NLS-1$
- 
+
     /**
-     *  Translates integer codes to request header names    
+     *  Translates integer codes to request header names
      */
     private static final String []headerTransArray = {
         "accept",               //$NON-NLS-1$
@@ -99,7 +99,7 @@
     }
 
     @Override
-    protected HTTPSampleResult sample(URL url, 
+    protected HTTPSampleResult sample(URL url,
                        String method,
                        boolean frd,
                        int fd) {
@@ -136,7 +136,7 @@
         stringBody = null;
     }
 
-    private void setupConnection(URL url, 
+    private void setupConnection(URL url,
                  String method,
                  HTTPSampleResult res) throws IOException {
 
@@ -228,7 +228,7 @@
         StringBuilder hbuf = new StringBuilder();
         // Allow Headers to override Host setting
         hbuf.append("Host").append(COLON_SPACE).append(host).append(NEWLINE);//$NON-NLS-1$
-        setInt(0xA00b); //Host 
+        setInt(0xA00b); //Host
         setString(host);
         if(headers != null) {
             CollectionProperty coll = headers.getHeaders();
@@ -371,7 +371,7 @@
         os.write(outbuf, 0, len);
     }
 
-    private void execute(String method, HTTPSampleResult res) 
+    private void execute(String method, HTTPSampleResult res)
     throws IOException {
         send();
         if(method.equals(POST)) {
@@ -387,7 +387,7 @@
         while(msg != 5) {
             if(msg == 3) {
             int len = getInt();
-                responseData.write(inbuf, inpos, len); 
+                responseData.write(inbuf, inpos, len);
             } else if(msg == 4) {
                 parseHeaders(res);
             } else if(msg == 6) {
@@ -421,7 +421,7 @@
     }
 
 
-    private void parseHeaders(HTTPSampleResult res) 
+    private void parseHeaders(HTTPSampleResult res)
     throws IOException {
         int status = getInt();
         res.setResponseCode(Integer.toString(status));
@@ -465,7 +465,7 @@
             channel = null;
             throw new IOException("Connection Closed: "+nr);
         }
-    //int mark = 
+    //int mark =
         getInt();
         int len = getInt();
         int toRead = len;

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Tue Feb 23 16:09:09 2010
@@ -37,7 +37,7 @@
     private String method;
 
     /**
-     * The raw value of the Location: header; may be null. 
+     * The raw value of the Location: header; may be null.
      * This is supposed to be an absolute URL:
      * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30">RFC2616 sec14.30</a>
      * but is often relative.
@@ -48,7 +48,7 @@
 
     private static final String HTTP_NO_CONTENT_CODE = Integer.toString(HttpURLConnection.HTTP_NO_CONTENT);
     private static final String HTTP_NO_CONTENT_MSG = "No Content"; // $NON-NLS-1$
-    
+
     public HTTPSampleResult() {
         super();
         setDataEncoding(DEFAULT_HTTP_ENCODING); // default if encoding not provided be the page
@@ -209,7 +209,7 @@
         }
         return super.getDataEncodingWithDefault();
     }
-    
+
     public void setResponseNoContent(){
         setResponseCode(HTTP_NO_CONTENT_CODE);
         setResponseMessage(HTTP_NO_CONTENT_MSG);

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java Tue Feb 23 16:09:09 2010
@@ -59,7 +59,7 @@
  *
  */
 public class HTTPSampler extends HTTPSamplerBase implements Interruptible {
-    private static final boolean OBEY_CONTENT_LENGTH = 
+    private static final boolean OBEY_CONTENT_LENGTH =
         JMeterUtils.getPropDefault("httpsampler.obey_contentlength", false); // $NON-NLS-1$
 
     private static final long serialVersionUID = 233L;
@@ -176,12 +176,12 @@
         if (cto > 0){
             conn.setConnectTimeout(cto);
         }
-        
+
         int rto = getResponseTimeout();
         if (rto > 0){
             conn.setReadTimeout(rto);
         }
-        
+
         if (PROTOCOL_HTTPS.equalsIgnoreCase(u.getProtocol())) {
             try {
                 if (null != sslmgr){
@@ -456,7 +456,7 @@
         res.setSampleLabel(urlStr);
         res.setURL(url);
         res.setHTTPMethod(method);
-        
+
         res.sampleStart(); // Count the retries as well in the time
 
         // Check cache for an entry with an Expires header in the future
@@ -469,7 +469,7 @@
                return res;
            }
         }
-        
+
         try {
             // Sampling proper - establish the connection and read the response:
             // Repeatedly try to connect:
@@ -480,7 +480,7 @@
                     conn = setupConnection(url, method, res);
                     // Attempt the connection:
                     savedConn = conn;
-                    conn.connect();                        
+                    conn.connect();
                     break;
                 } catch (BindException e) {
                     if (retry >= MAX_CONN_RETRIES) {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java Tue Feb 23 16:09:09 2010
@@ -121,7 +121,7 @@
 
     private static final String PROXY_DOMAIN =
         JMeterUtils.getPropDefault("http.proxyDomain",""); // $NON-NLS-1$ $NON-NLS-2$
-    
+
     public static final String IP_SOURCE = "HTTPSampler.ipSource"; // $NON-NLS-1$
 
     static final InetAddress localAddress;
@@ -550,7 +550,7 @@
 
         boolean useStaticProxy = PROXY_DEFINED && !isNonProxy(host);
         boolean useDynamicProxy = false;
-        
+
         final String proxyHost = getProxyHost();
         final int proxyPort = getProxyPortInt();
         if (proxyHost.length() > 0 && proxyPort > 0){
@@ -591,9 +591,9 @@
                 httpClient.getState().setProxyCredentials(
                         new AuthScope(proxyHost,proxyPort,null,AuthScope.ANY_SCHEME),
                         new NTCredentials(user,getProxyPass(),localHost,PROXY_DOMAIN)
-                    );                
+                    );
             } else {
-                httpClient.getState().clearProxyCredentials();                
+                httpClient.getState().clearProxyCredentials();
             }
         } else {
             if (useStaticProxy) {
@@ -607,7 +607,7 @@
                 httpClient.getState().clearProxyCredentials();
             }
         }
-        
+
         int rto = getResponseTimeout();
         if (rto > 0){
             httpMethod.getParams().setSoTimeout(rto);
@@ -1173,7 +1173,7 @@
         return client != null;
     }
 
-    
+
     public void setIpSource(String value) {
         setProperty(IP_SOURCE, value, "");
     }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Tue Feb 23 16:09:09 2010
@@ -1353,7 +1353,7 @@
      */
     private void setHTTPFileArgs(HTTPFileArgs value) {
         if (value.getHTTPFileArgCount() > 0){
-            setProperty(new TestElementProperty(FILE_ARGS, value));            
+            setProperty(new TestElementProperty(FILE_ARGS, value));
         } else {
             removeProperty(FILE_ARGS); // no point saving an empty list
         }
@@ -1501,7 +1501,7 @@
      *
      * Versions after 2.3.4 dispense with the original set of 3 properties.
      * Test plans that use them are converted to use a single HTTPFileArgs list.
-     * 
+     *
      * @see HTTPSamplerBaseConverter
      */
     void mergeFileProperties() {
@@ -1509,7 +1509,7 @@
         JMeterProperty paramName = getProperty(FILE_FIELD);
         JMeterProperty mimeType = getProperty(MIMETYPE);
         HTTPFileArg oldStyleFile = new HTTPFileArg(fileName, paramName, mimeType);
-        
+
         HTTPFileArgs fileArgs = getHTTPFileArgs();
 
         HTTPFileArgs allFileArgs = new HTTPFileArgs();

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  * License for the specific language governing permissions and limitations
  * under the License.
- *  
+ *
  */
 
 /*
@@ -27,7 +27,7 @@
  * This class does not appear to be used.
  * However, without it, there are test errors for the AccessLog Sampler:
  * unable to find property autoRedirects.displayName.
- * 
+ *
  */
 public class HTTPSamplerBaseBeanInfo extends AbstractTestElementBeanInfo {
 

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java Tue Feb 23 16:09:09 2010
@@ -14,7 +14,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.jmeter.protocol.http.sampler;
@@ -43,9 +43,9 @@
     private static final Logger log = LoggingManager.getLoggerForClass();
 
     // Non-instantiable
-    private HttpClientDefaultParameters(){        
+    private HttpClientDefaultParameters(){
     }
-    
+
     public static void load(String file, HttpParams params){
         log.info("Reading httpclient parameters from "+file);
         File f = new File(file);
@@ -85,7 +85,7 @@
                 } catch (ProtocolException e) {
                     log.error("Error in property: "+key+"="+value+" "+e.toString());
                 }
-            }        
+            }
         } catch (FileNotFoundException e) {
             log.error("Problem loading properties "+e.toString());
         } catch (IOException e) {

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java Tue Feb 23 16:09:09 2010
@@ -548,7 +548,7 @@
                 } else {
                     result.setSuccessful(false);
                     result.setResponseCode("999");
-                    result.setResponseMessage("Empty response");                    
+                    result.setResponseMessage("Empty response");
                 }
             } else {
                 result.sampleEnd();
@@ -594,10 +594,10 @@
                 result.setResponseMessage(exception.toString());
             }
         } finally {
-            // Make sure the sample start time and sample end time are recorded 
-            // in order not to confuse the statistics calculation methods: if 
+            // Make sure the sample start time and sample end time are recorded
+            // in order not to confuse the statistics calculation methods: if
             //  an error occurs and an exception is thrown it is possible that
-            // the result.sampleStart() or result.sampleEnd() won't be called  
+            // the result.sampleStart() or result.sampleEnd() won't be called
             if (result.getStartTime() == 0)
             {
                 result.sampleStart();

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
 package org.apache.jmeter.protocol.http.util;
@@ -39,7 +39,7 @@
     /**
      * Extract the encoding (charset) from the Content-Type,
      * e.g. "text/html; charset=utf-8".
-     * 
+     *
      * @param contentType
      * @return the charset encoding - or null, if none was found or the charset is not supported
      */
@@ -73,11 +73,11 @@
         }
         return charSet;
     }
-    
+
     /**
      * Generate a relative URL, allowing for extraneous leading "../" segments.
      * The Java {@link URL#URL(URL, String)} constructor does not remove these.
-     * 
+     *
      * @param baseURL
      * @param location relative location, possibly with extraneous leading "../"
      * @return URL with extraneous ../ removed

Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java Tue Feb 23 16:09:09 2010
@@ -34,9 +34,9 @@
 public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampler, TestBean {
 
     private static final long serialVersionUID = 234L;
-    
+
     private static final Logger log = LoggingManager.getLoggerForClass();
-    
+
     public SampleResult sample(Entry entry) {
         SampleResult result = new SampleResult();
         result.setSampleLabel(getName());
@@ -54,7 +54,7 @@
                 result.setSuccessful(false);
                 result.setResponseCode("500"); // $NON-NLS-1$
                 result.setResponseMessage("Could not instantiate ScriptManager");
-                return result; 
+                return result;
             }
             Object ret = processFileOrScript(mgr);
             result.setSuccessful(true);

Modified: jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java Tue Feb 23 16:09:09 2010
@@ -79,7 +79,7 @@
     // key: name (lowercase) from java.sql.Types; entry: corresponding int value
     private static final Map<String, Integer> mapJdbcNameToInt;
     // read-only after class init
-    
+
     static {
         // based on e291. Getting the Name of a JDBC Type from javaalmanac.com
         // http://javaalmanac.com/egs/java.sql/JdbcInt2Str.html
@@ -409,13 +409,13 @@
      *            ResultSet passed in from a database query
      * @return a Data object
      * @throws java.sql.SQLException
-     * @throws UnsupportedEncodingException 
+     * @throws UnsupportedEncodingException
      */
     private String getStringFromResultSet(ResultSet rs) throws SQLException, UnsupportedEncodingException {
         ResultSetMetaData meta = rs.getMetaData();
 
         StrBuilder sb = new StrBuilder();
-        
+
         int numColumns = meta.getColumnCount();
         for (int i = 1; i <= numColumns; i++) {
             sb.append(meta.getColumnName(i));
@@ -469,7 +469,7 @@
                 jmvars.put(varCount, Integer.toString(j)); // save the current count
             }
         }
-        
+
         return sb.toString();
     }
 

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java Tue Feb 23 16:09:09 2010
@@ -72,7 +72,7 @@
     private ArgumentsPanel jndiPropertiesPanel;
 
     private JCheckBox useNonPersistentDelivery;
-    
+
     private JCheckBox useReqMsgIdAsCorrelId;
 
     public JMSConfigGui() {
@@ -187,7 +187,7 @@
 
         useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
         useReqMsgIdAsCorrelId.setSelected(sampler.isUseReqMsgIdAsCorrelId());
-        
+
         timeout.setText(sampler.getTimeout());
         soapXml.setText(sampler.getContent());
         initialContextFactory.setText(sampler.getInitialContextFactory());
@@ -236,7 +236,7 @@
                 JMeterUtils.getResString("jms_message_title"))); //$NON-NLS-1$
 
         useReqMsgIdAsCorrelId = new JCheckBox(JMeterUtils.getResString("jms_use_req_msgid_as_correlid"),false); //$NON-NLS-1$
-        
+
         JPanel messageNorthPanel = new JPanel(new BorderLayout());
         JPanel onewayPanel = new HorizontalPanel();
         onewayPanel.add(oneWay);

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Tue Feb 23 16:09:09 2010
@@ -61,7 +61,7 @@
     private static final String TEXT_MSG_RSC = "jms_text_message"; //$NON-NLS-1$
     private static final String OBJECT_MSG_RSC = "jms_object_message"; //$NON-NLS-1$
     //--
-    
+
     // Button group resources
     private static final String[] CONFIG_ITEMS = { USE_FILE_RSC, USE_RANDOM_RSC, USE_TEXT_RSC };
 
@@ -181,7 +181,7 @@
         mainPanel.add(getNamePanel());
 
         // Button for browsing webservice wsdl
-        
+
         lookup.setLayout(new VerticalLayout(6, VerticalLayout.LEFT));
         mainPanel.add(lookup);
         lookup.add(useProperties);

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java Tue Feb 23 16:09:09 2010
@@ -70,7 +70,7 @@
     private final JLabeledTextField iterations =
         new JLabeledTextField(JMeterUtils.getResString("jms_itertions")); // $NON-NLS-1$
 
-    private final JCheckBox useAuth = 
+    private final JCheckBox useAuth =
         new JCheckBox(JMeterUtils.getResString("jms_use_auth"), false); //$NON-NLS-1$
 
     private final JCheckBox readResponse =
@@ -81,13 +81,13 @@
 
     public final static String ON_MESSAGE_RSC = "jms_subscriber_on_message"; // $NON-NLS-1$
     //--
-    
+
     // Button group resources
     private final static String[] CLIENT_ITEMS = { RECEIVE_RSC, ON_MESSAGE_RSC };
 
     private final JLabeledRadioI18N clientChoice =
         new JLabeledRadioI18N("jms_client_type", CLIENT_ITEMS, RECEIVE_RSC); // $NON-NLS-1$
-            
+
     private final JPanel lookup = new JPanel();
 
     public JMSSubscriberGui() {

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Tue Feb 23 16:09:09 2010
@@ -287,11 +287,11 @@
     public boolean getUseJNDIPropertiesAsBoolean() {
         return getPropertyAsBoolean(USE_PROPERTIES_FILE);
     }
-    
-    
+
+
     /**
      * Returns a String with the JMS Message Header values.
-     * 
+     *
      * @param message JMS Message
      * @return String with message header values.
      */

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java Tue Feb 23 16:09:09 2010
@@ -27,9 +27,9 @@
 
 /**
  * Request/reply executor with a fixed reply queue. <br>
- * 
+ *
  * Used by JMS Sampler (Point to Point)
- * 
+ *
  * Created on: October 28, 2004
  *
  */
@@ -42,7 +42,7 @@
 
     /** Timeout used for waiting on message. */
     private final int timeout;
-    
+
     private final boolean useReqMsgIdAsCorrelId;
 
     /**
@@ -85,7 +85,7 @@
             return null;
         }
         producer.send(request);
-        
+
         if(useReqMsgIdAsCorrelId) {
             id = request.getJMSMessageID();
         }

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Tue Feb 23 16:09:09 2010
@@ -91,9 +91,9 @@
     //--
 
     // Should we use java.naming.security.[principal|credentials] to create the QueueConnection?
-    private static final boolean USE_SECURITY_PROPERTIES = 
+    private static final boolean USE_SECURITY_PROPERTIES =
         JMeterUtils.getPropDefault("JMSSampler.useSecurity.properties", true); // $NON-NLS-1$
-    
+
     //
     // Member variables
     //
@@ -187,7 +187,7 @@
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("Adding property [" + name + "=" + value + "]");
             }
-            
+
             // WebsphereMQ does not allow corr. id. to be set using setStringProperty()
             if("JMSCorrelationID".equalsIgnoreCase(name)) { // $NON-NLS-1$
                 msg.setJMSCorrelationID(value);
@@ -294,7 +294,7 @@
             context = getInitialContext();
             Object obj = context.lookup(getQueueConnectionFactory());
             if (!(obj instanceof QueueConnectionFactory)) {
-                String msg = "QueueConnectionFactory expected, but got " 
+                String msg = "QueueConnectionFactory expected, but got "
                     + obj == null ? "null" :  obj.getClass().getName();
                 LOGGER.fatalError(msg);
                 throw new IllegalStateException(msg);
@@ -312,7 +312,7 @@
             String credentials = null;
             if (USE_SECURITY_PROPERTIES){
                 principal = getPrincipal(context);
-                credentials = getCredentials(context);                
+                credentials = getCredentials(context);
             }
             if (principal != null && credentials != null) {
                 connection = factory.createQueueConnection(principal, credentials);
@@ -431,7 +431,7 @@
         }
         return getPropertyAsInt(TIMEOUT);
     }
-    
+
     public String getTimeout() {
         return getPropertyAsString(TIMEOUT, DEFAULT_TIMEOUT_STRING);
     }

Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Tue Feb 23 16:09:09 2010
@@ -53,7 +53,7 @@
 
     //@GuardedBy("this")
     private transient int counter = 0;
-    
+
     private transient volatile boolean interrupted = false;
 
     // Don't change the string, as it is used in JMX files
@@ -289,7 +289,7 @@
         }
         return choice;
     }
-    
+
     /**
      * Handle an interrupt of the test.
      */

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
 package org.apache.jmeter.protocol.mail.sampler;
@@ -43,9 +43,9 @@
         public boolean accept(File dir, String name) {
             return name.matches(FILENAME_REGEX);
         }
-        
+
     };
-    
+
     public MailFileFolder(Store store, String path) {
         super(store);
         String base = store.getURLName().getHost(); // == ServerName from mail sampler
@@ -54,7 +54,7 @@
         if (isFile){
             folderPath = new File(base);
         } else {
-            folderPath = new File(base,path);            
+            folderPath = new File(base,path);
         }
     }
 

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
 package org.apache.jmeter.protocol.mail.sampler;
@@ -27,7 +27,7 @@
 import javax.mail.URLName;
 
 public class MailFileStore extends Store {
-    
+
     public MailFileStore(Session s, URLName u){
         super(s,u);
     }

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Tue Feb 23 16:09:09 2010
@@ -67,7 +67,7 @@
     private static final String NEW_LINE = "\n"; // $NON-NLS-1$
     private final static String STORE_MIME_MESSAGE = "storeMimeMessage";
     //-
-    
+
     private static final String RFC_822_DEFAULT_ENCODING = "iso-8859-1"; // RFC 822 uses ascii per default
 
     public static final String DEFAULT_PROTOCOL = "pop3";  // $NON-NLS-1$
@@ -92,7 +92,7 @@
         boolean deleteMessages = getDeleteMessages();
 
         parent.setSampleLabel(getName());
-        
+
         String samplerString = toString();
         parent.setSamplerData(samplerString);
 
@@ -134,14 +134,14 @@
             }
 
             parent.setSampleCount(n); // TODO is this sensible?
-            
+
             busy = true;
             for (int i = 0; busy && i < n; i++) {
                 StringBuilder cdata = new StringBuilder();
                 SampleResult child = new SampleResult();
                 child.sampleStart();
                 Message message = messages[i];
-                
+
                 cdata.append("Message "); // $NON-NLS-1$
                 cdata.append(message.getMessageNumber());
                 child.setSampleLabel(cdata.toString());
@@ -452,7 +452,7 @@
     public void setStoreMimeMessage(boolean storeMimeMessage) {
         setProperty(STORE_MIME_MESSAGE, storeMimeMessage, false);
     }
-    
+
     @Override
     public String toString(){
         StringBuilder sb = new StringBuilder();

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
 package org.apache.jmeter.protocol.tcp.sampler;
@@ -25,7 +25,7 @@
 
     protected byte eolByte;
     protected boolean useEolByte = false;
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java Tue Feb 23 16:09:09 2010
@@ -17,8 +17,8 @@
  */
 
 /*
- * TCP Sampler Client implementation which reads and writes binary data.  
- * 
+ * TCP Sampler Client implementation which reads and writes binary data.
+ *
  * Input/Output strings are passed as hex-encoded binary strings.
  *
  */
@@ -43,7 +43,7 @@
  * If there is no EOM byte defined, then reads until
  * the end of the stream is reached.
  * The EOM byte is defined by the property "tcp.BinaryTCPClient.eomByte".
- * 
+ *
  * Input data is assumed to be in hex, and is converted to binary
  */
 public class BinaryTCPClientImpl extends AbstractTCPClient {
@@ -61,7 +61,7 @@
 
     /**
      * Convert hex string to binary byte array.
-     * 
+     *
      * @param hexEncodedBinary - hex-encoded binary string
      * @return Byte array containing binary representation of input hex-encoded string
      * @throws IllegalArgumentException if string is not an even number of hex digits
@@ -76,7 +76,7 @@
                 int nibble1 = Character.digit(sc[i * 2 + 1], 16);
                 if (nibble0 == -1 || nibble1 == -1){
                     throw new IllegalArgumentException(
-                    "Hex-encoded binary string contains an invalid hex digit in '"+sc[i * 2]+sc[i * 2 + 1]+"'");                    
+                    "Hex-encoded binary string contains an invalid hex digit in '"+sc[i * 2]+sc[i * 2 + 1]+"'");
                 }
                 ba[i] = (byte) ((nibble0 << 4) | (nibble1));
             }

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java Tue Feb 23 16:09:09 2010
@@ -17,12 +17,12 @@
  */
 
 /*
- * TCP Sampler Client implementation which reads and writes length-prefixed binary data.  
- * 
+ * TCP Sampler Client implementation which reads and writes length-prefixed binary data.
+ *
  * Input/Output strings are passed as hex-encoded binary strings.
- * 
+ *
  * 2-Byte or 4-Byte length prefixes are supported.
- * 
+ *
  * Length prefix is binary of length specified by property "tcp.length.prefix.length".
  *
  */
@@ -45,7 +45,7 @@
  */
 public class LengthPrefixedBinaryTCPClientImpl extends TCPClientDecorator {
     private static final Logger log = LoggingManager.getLoggerForClass();
-    
+
     private final int lengthPrefixLen = JMeterUtils.getPropDefault("tcp.binarylength.prefix.length", 2); // $NON-NLS-1$
 
     public LengthPrefixedBinaryTCPClientImpl() {

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java Tue Feb 23 16:09:09 2010
@@ -31,7 +31,7 @@
  * Interface required by TCPSampler for TCPClient implementations.
  */
 public interface TCPClient {
-    
+
     /**
      * Versions of JMeter after 2.3.2 invoke this method when the thread starts.
      */
@@ -77,7 +77,7 @@
     /**
      * Set the end-of-line/end-of-message byte.
      * If the value is out of range of a byte, then it is to be ignored.
-     * 
+     *
      * @param eolInt
      *            The value to set
      */

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java Tue Feb 23 16:09:09 2010
@@ -18,13 +18,13 @@
 
 /*
  * TCP Sampler Client decorator to permit wrapping base client implementations with length prefixes.
- * For example, character data or binary data with character length or binary length 
+ * For example, character data or binary data with character length or binary length
  *
  */
 package org.apache.jmeter.protocol.tcp.sampler;
 
 public abstract class TCPClientDecorator extends AbstractTCPClient {
-    
+
     protected final TCPClient tcpClient; // the data implementation
 
     public TCPClientDecorator(TCPClient tcpClient) {
@@ -33,7 +33,7 @@
 
     /**
      * Convert int to byte array.
-     * 
+     *
      * @param value
      *            - int to be converted
      * @param len
@@ -61,7 +61,7 @@
 
     /**
      * Convert byte array to int.
-     * 
+     *
      * @param b
      *            - Byte array to be converted
      * @return Integer value of input byte array

Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java Tue Feb 23 16:09:09 2010
@@ -228,13 +228,13 @@
     }
 
     public void setClassname(String classname) {
-        this.setProperty(CLASSNAME, classname, ""); //$NON-NLS-1$ 
+        this.setProperty(CLASSNAME, classname, ""); //$NON-NLS-1$
     }
 
     public String getClassname() {
         String clazz = getPropertyAsString(CLASSNAME,"");
         if (clazz==null || clazz.length()==0){
-            clazz = JMeterUtils.getPropDefault("tcp.handler", "TCPClientImpl"); //$NON-NLS-1$ $NON-NLS-2$            
+            clazz = JMeterUtils.getPropDefault("tcp.handler", "TCPClientImpl"); //$NON-NLS-1$ $NON-NLS-2$
         }
         return clazz;
     }
@@ -298,7 +298,7 @@
                 res.setResponseMessage(getError());
             } else if (protocolHandler == null){
                 res.setResponseCode("500"); //$NON-NLS-1$
-                res.setResponseMessage("Protocol handler not found");                
+                res.setResponseMessage("Protocol handler not found");
             } else {
                 InputStream is = sock.getInputStream();
                 OutputStream os = sock.getOutputStream();

Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 package org.apache.jmeter.testelement;
 
@@ -24,7 +24,7 @@
 
 /**
  * ReportPage
- * 
+ *
  */
 public class ReportPage extends AbstractTestElement implements Serializable {
     private static final long serialVersionUID = 240L;
@@ -37,7 +37,7 @@
     public static final String REPORT_PAGE_HEADER = "ReportPage.header";
     public static final String REPORT_PAGE_FOOTER = "ReportPage.footer";
     public static final String REPORT_PAGE_INTRO = "ReportPage.intro";
-    
+
     /**
      * No-arg constructor.
      */
@@ -52,49 +52,49 @@
     public String getTitle() {
         return getPropertyAsString(REPORT_PAGE_TITLE);
     }
-    
+
     public void setTitle(String title) {
         setProperty(REPORT_PAGE_TITLE,title);
     }
-    
+
     public boolean getIndex() {
         return getPropertyAsBoolean(REPORT_PAGE_INDEX);
     }
-    
+
     public void setIndex(String makeIndex) {
         setProperty(REPORT_PAGE_INDEX,makeIndex);
     }
-    
+
     public String getCSS() {
         return getPropertyAsString(REPORT_PAGE_CSS);
     }
-    
+
     public void setCSS(String css) {
         setProperty(REPORT_PAGE_CSS,css);
     }
-    
+
     public String getHeaderURL() {
         return getPropertyAsString(REPORT_PAGE_HEADER);
     }
-    
+
     public void setHeaderURL(String url) {
         setProperty(REPORT_PAGE_HEADER,url);
     }
-    
+
     public String getFooterURL() {
         return getPropertyAsString(REPORT_PAGE_FOOTER);
     }
-    
+
     public void setFooterURL(String url) {
         setProperty(REPORT_PAGE_FOOTER,url);
     }
-    
+
     public String getIntroduction() {
         return getPropertyAsString(REPORT_PAGE_INTRO);
     }
-    
+
     public void setIntroduction(String intro) {
         setProperty(REPORT_PAGE_INTRO,intro);
     }
-    
+
 }



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