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 2006/03/24 13:26:37 UTC
svn commit: r388499 - in /jakarta/jmeter/branches/rel-2-1:
src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
xdocs/changes.xml
Author: sebb
Date: Fri Mar 24 04:26:33 2006
New Revision: 388499
URL: http://svn.apache.org/viewcvs?rev=388499&view=rev
Log:
Add write(OS,IS) implementation
Modified:
jakarta/jmeter/branches/rel-2-1/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java?rev=388499&r1=388498&r2=388499&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java Fri Mar 24 04:26:33 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation.
+ * Copyright 2003-2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,12 +79,30 @@
os.write(s.getBytes());
os.flush();
} catch (IOException e) {
- log.debug("Write error", e);
+ log.warn("Write error", e);
}
log.debug("Wrote: " + s);
return;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream,
+ * java.io.InputStream)
+ */
+ public void write(OutputStream os, InputStream is) {
+ byte buff[]=new byte[512];
+ try {
+ while(is.read(buff) > 0){
+ os.write(buff);
+ os.flush();
+ }
+ } catch (IOException e) {
+ log.warn("Write error", e);
+ }
+ }
+
/*
* (non-Javadoc)
*
@@ -125,17 +143,6 @@
// do we need to close byte array (or flush it?)
log.debug("Read: " + w.size() + "\n" + w.toString());
return w.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.protocol.tcp.sampler.TCPClient#write(java.io.OutputStream,
- * java.io.InputStream)
- */
- public void write(OutputStream os, InputStream is) {
- // TODO Auto-generated method stub
- return;
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=388499&r1=388498&r2=388499&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Fri Mar 24 04:26:33 2006
@@ -101,6 +101,7 @@
<li>Bug 38902 - sometimes -1 seems to be returned unnecessarily for response code</li>
<li>Bug 38840 - make XML Assertion thread-safe</li>
<li>Bug 38681 - Include controller now works in non-GUI mode</li>
+<li>Add write(OS,IS) implementation to TCPClientImpl</li>
</ul>
<h4>Other changes</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org