You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/18 20:29:40 UTC
svn commit: r1774941 - in /jmeter/trunk/src:
core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Author: pmouawad
Date: Sun Dec 18 20:29:40 2016
New Revision: 1774941
URL: http://svn.apache.org/viewvc?rev=1774941&view=rev
Log:
space policy
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java?rev=1774941&r1=1774940&r2=1774941&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Sun Dec 18 20:29:40 2016
@@ -115,7 +115,7 @@ public class JSyntaxTextArea extends RSy
* The number of rows for the text area
* @param cols
* The number of columns for the text area
- * @return {@link JSyntaxTextArea}
+ * @return {@link JSyntaxTextArea}
*/
public static JSyntaxTextArea getInstance(int rows, int cols) {
return getInstance(rows, cols, false);
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=1774941&r1=1774940&r2=1774941&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java Sun Dec 18 20:29:40 2016
@@ -444,7 +444,7 @@ public class TCPSampler extends Abstract
Exception exception,
TCPClient protocolHandler) {
sampleResult.setResponseData(readResponse,
- protocolHandler != null ? protocolHandler.getCharset() : null);
+ protocolHandler != null ? protocolHandler.getCharset() : null);
sampleResult.setDataType(SampleResult.TEXT);
if(exception==null) {
sampleResult.setResponseCodeOK();
@@ -540,14 +540,14 @@ public class TCPSampler extends Abstract
private void tearDown() {
Map<String, Object> cp = tp.get();
cp.forEach((k, v) -> {
- if(k.startsWith(TCPKEY)) {
- try {
- ((Socket)v).close();
- } catch (IOException e) {
- // NOOP
- }
- }
- });
+ if(k.startsWith(TCPKEY)) {
+ try {
+ ((Socket)v).close();
+ } catch (IOException e) {
+ // NOOP
+ }
+ }
+ });
cp.clear();
tp.remove();
}
@@ -563,16 +563,16 @@ public class TCPSampler extends Abstract
@Override
public boolean interrupt() {
- Optional<Socket> sock = Optional.ofNullable(currentSocket); // fetch in case gets nulled later
- if(sock.isPresent()) {
- try {
- sock.get().close();
- } catch (IOException e) {
- // ignored
- }
- return true;
- } else {
- return false;
- }
+ Optional<Socket> sock = Optional.ofNullable(currentSocket); // fetch in case gets nulled later
+ if(sock.isPresent()) {
+ try {
+ sock.get().close();
+ } catch (IOException e) {
+ // ignored
+ }
+ return true;
+ } else {
+ return false;
+ }
}
}