Author: sebb
Date: Wed Nov  5 09:12:30 2008
New Revision: 711625

URL: http://svn.apache.org/viewvc?rev=711625&view=rev
Log:
Use new AbstractTCPClient super-class
Update Javadoc

Modified:
    
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java

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=711625&r1=711624&r2=711625&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
 Wed Nov  5 09:12:30 2008
@@ -37,10 +37,15 @@
 import org.apache.log.Logger;
 
 /**
- * Sample TCPClient implementation
+ * TCPClient implementation.
+ * Reads data until the defined EOM byte is reached.
+ * 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 implements TCPClient {
+public class BinaryTCPClientImpl extends AbstractTCPClient {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
     private int eomInt = 
JMeterUtils.getPropDefault("tcp.BinaryTCPClient.eomByte", 1000); // $NON_NLS-1$
@@ -81,40 +86,19 @@
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#setupTest()
-     */
-    public void setupTest() {
-        log.info("setuptest");
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#teardownTest()
-     */
-    public void teardownTest() {
-        log.info("teardowntest");
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * 
org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream
-     * , java.lang.String)
+    /**
+     * Input (hex) string is converted to binary and written to the output 
stream.
+     * @param os output stream
+     * @param hexEncodedBinary hex-encoded binary
      */
-    public void write(OutputStream os, String s) {
+    public void write(OutputStream os, String hexEncodedBinary) {
         try {
-            os.write(hexStringToByteArray(s));
+            os.write(hexStringToByteArray(hexEncodedBinary));
             os.flush();
         } catch (IOException e) {
             log.warn("Write error", e);
         }
-        log.debug("Wrote: " + s);
+        log.debug("Wrote: " + hexEncodedBinary);
         return;
     }
 
@@ -130,12 +114,12 @@
                 "Method not supported for Length-Prefixed data.");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * 
org.apache.jmeter.protocol.tcp.sampler.TCPClient#read(java.io.InputStream
-     * )
+    /**
+     * Reads data until the defined EOM byte is reached.
+     * If there is no EOM byte defined, then reads until
+     * the end of the stream is reached.
+     * Response data is converted to hex-encoded binary
+     * @return hex-encoded binary string
      */
     public String read(InputStream is) {
         byte[] buffer = new byte[4096];



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to