jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1544801 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java
Date Sat, 23 Nov 2013 14:02:40 GMT
Author: sebb
Date: Sat Nov 23 14:02:39 2013
New Revision: 1544801

URL: http://svn.apache.org/r1544801
Log:
Tab police
Hope I've now configure Eclipse to never insert tabs ...

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jmeter/trunk/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1544801&r1=1544800&r2=1544801&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sat Nov
23 14:02:39 2013
@@ -164,15 +164,15 @@ public class Proxy extends Thread {
         HTTPSamplerBase sampler = null;
         final boolean isDebug = log.isDebugEnabled();
         if (isDebug) {
-        	log.debug(port + "====================================================================");
+            log.debug(port + "====================================================================");
         }
         try {
             // Now, parse initial request (in case it is a CONNECT request)
             byte[] ba = request.parse(new BufferedInputStream(clientSocket.getInputStream()));
             if (ba.length == 0) {
-            	if (isDebug) {
-            		log.debug(port + "Empty request, ignored");
-            	}
+                if (isDebug) {
+                    log.debug(port + "Empty request, ignored");
+                }
                 throw new JMeterException(); // hack to skip processing
             }
             if (isDebug) {
@@ -182,7 +182,7 @@ public class Proxy extends Thread {
 
             if ((request.getMethod().startsWith(HTTPConstants.CONNECT)) && (outStreamClient
!= null)) {
                 if (isDebug) {
-                	log.debug(port + "Method CONNECT => SSL");
+                    log.debug(port + "Method CONNECT => SSL");
                 }
                 // write a OK reponse to browser, to engage SSL exchange
                 outStreamClient.write(("HTTP/1.0 200 OK\r\n\r\n").getBytes(SampleResult.DEFAULT_HTTP_ENCODING));
// $NON-NLS-1$
@@ -190,9 +190,9 @@ public class Proxy extends Thread {
                // With ssl request, url is host:port (without https:// or path)
                 String[] param = request.getUrl().split(":");  // $NON-NLS-1$
                 if (param.length == 2) {
-                	if (isDebug) {
-                		log.debug(port + "Start to negotiate SSL connection, host: " + param[0]);
-                	}
+                    if (isDebug) {
+                        log.debug(port + "Start to negotiate SSL connection, host: " + param[0]);
+                    }
                     clientSocket = startSSL(clientSocket, param[0]);
                 } else {
                     // Should not happen, but if it does we don't want to continue 
@@ -338,7 +338,7 @@ public class Proxy extends Thread {
             final SSLSocketFactory sslSocketFactory = HOST2SSL_SOCK_FAC.get(hashAlias);
             if (sslSocketFactory != null) {
                 if (log.isDebugEnabled()) {
-                	log.debug(port + "Good, already in map, host=" + host + " using alias "
+ hashAlias);
+                    log.debug(port + "Good, already in map, host=" + host + " using alias
" + hashAlias);
                 }
                 return sslSocketFactory;
             }
@@ -477,7 +477,7 @@ public class Proxy extends Thread {
             out.write(res.getResponseData());
             out.flush();
             if (log.isDebugEnabled()) {
-            	log.debug(port + "Done writing to client");
+                log.debug(port + "Done writing to client");
             }
         } catch (IOException e) {
             log.error("", e);
@@ -591,9 +591,9 @@ public class Proxy extends Thread {
             finder.addFormActionsAndCharSet(result.getResponseDataAsString(), formEncodings,
pageEncoding);
         }
         catch (HTMLParseException parseException) {
-        	if (log.isDebugEnabled()) {
-        		log.debug(port + "Unable to parse response, could not find any form character set
encodings");
-        	}
+            if (log.isDebugEnabled()) {
+                log.debug(port + "Unable to parse response, could not find any form character
set encodings");
+            }
         }
     }
 

Modified: jmeter/trunk/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java?rev=1544801&r1=1544800&r2=1544801&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java Sat Nov 23
14:02:39 2013
@@ -93,7 +93,7 @@ public class TristateCheckBoxTest {
                 case INDETERMINATE:
                     System.out.println("Tristate Selected"); break;
                 default:
-                	System.err.println("Unexpected state: " + tristateBox.getState()); break;
+                    System.err.println("Unexpected state: " + tristateBox.getState()); break;
                 }
             }
         });
@@ -109,7 +109,7 @@ public class TristateCheckBoxTest {
                 case INDETERMINATE:
                     System.out.println("Tristate Selected"); break;
                 default:
-                	System.err.println("Unexpected state: " + tristateBox.getState()); break;
+                    System.err.println("Unexpected state: " + tristateBox.getState()); break;
                 }
             }
         });



Mime
View raw message