svn commit: r711606 - /jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java

[sebb]

Author: sebb
Date: Wed Nov  5 08:39:48 2008
New Revision: 711606

URL: http://svn.apache.org/viewvc?rev=711606&view=rev
Log:
Rename property to avoid clash with eolByte

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=711606&r1=711605&r2=711606&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 08:39:48 2008
@@ -43,21 +43,17 @@
 public class BinaryTCPClientImpl implements TCPClient {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private int eolInt = JMeterUtils.getPropDefault("tcp.eolByte", 1000); // 
default
+    private int eomInt = 
JMeterUtils.getPropDefault("tcp.BinaryTCPClient.eomByte", 1000); // $NON_NLS-1$
 
-    // is
-    // not
-    // in
-    // range
+    // End of message byte (defaults to none)
+    private byte eomByte = (byte) eomInt; // -128 to +127
 
-    private byte eolByte = (byte) eolInt; // -128 to +127
-
-    private boolean eolIgnore = eolInt < -128 || eolInt > 127;
+    private boolean eomIgnore = eomInt < -128 || eomInt > 127;
     
     public BinaryTCPClientImpl() {
         super();
-        if (!eolIgnore) {
-            log.info("Using eolByte=" + eolByte);
+        if (!eomIgnore) {
+            log.info("Using eomByte=" + eomByte);
         }
     }
 
@@ -148,7 +144,7 @@
         try {
             while ((x = is.read(buffer)) > -1) {
                 w.write(buffer, 0, x);
-                if (!eolIgnore && (buffer[x - 1] == eolByte)) {
+                if (!eomIgnore && (buffer[x - 1] == eomByte)) {
                     break;
                 }
             }
@@ -182,18 +178,18 @@
     }
 
     /**
-     * @return Returns the eolByte.
+     * @return Returns the eomByte.
      */
     public byte getEolByte() {
-        return eolByte;
+        return eomByte;
     }
 
     /**
-     * @param eolByte
-     *            The eolByte to set.
+     * @param eomByte
+     *            The eomByte to set.
      */
-    public void setEolByte(byte eolByte) {
-        this.eolByte = eolByte;
-        eolIgnore = false;
+    public void setEolByte(byte eomByte) {
+        this.eomByte = eomByte;
+        eomIgnore = false;
     }
 }



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