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/22 21:38:06 UTC
svn commit: r1775746 - in /jmeter/trunk/src:
core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Author: pmouawad
Date: Thu Dec 22 21:38:06 2016
New Revision: 1775746
URL: http://svn.apache.org/viewvc?rev=1775746&view=rev
Log:
Sonar : Fix errors and code smells
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java?rev=1775746&r1=1775745&r2=1775746&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java Thu Dec 22 21:38:06 2016
@@ -37,6 +37,9 @@ public class DataStrippingSampleSender e
private static final long serialVersionUID = -5556040298982085715L;
+ /** empty array which can be returned instead of null */
+ private static final byte[] EMPTY_BA = new byte[0];
+
private static final Logger log = LoggingManager.getLoggerForClass();
private static final boolean DEFAULT_STRIP_ALSO_ON_ERROR = true;
@@ -118,7 +121,7 @@ public class DataStrippingSampleSender e
*/
private void stripResponse(SampleResult result) {
result.setBytes(result.getBytesAsLong());
- result.setResponseData(SampleResult.EMPTY_BA);
+ result.setResponseData(EMPTY_BA);
}
/**
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=1775746&r1=1775745&r2=1775746&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java Thu Dec 22 21:38:06 2016
@@ -46,6 +46,9 @@ public class JSR223Sampler extends JSR22
private static final Logger log = LoggingManager.getLoggerForClass();
+ /** empty array which can be returned instead of null */
+ private static final byte[] EMPTY_BA = new byte[0];
+
@Override
public SampleResult sample(Entry entry) {
SampleResult result = new SampleResult();
@@ -67,7 +70,7 @@ public class JSR223Sampler extends JSR22
Bindings bindings = scriptEngine.createBindings();
bindings.put("SampleResult",result);
Object ret = processFileOrScript(scriptEngine, bindings);
- if (ret != null && (result.getResponseData() == null || result.getResponseData()==SampleResult.EMPTY_BA)){
+ if (ret != null && (result.getResponseData() == null || result.getResponseData()==EMPTY_BA)){
result.setResponseData(ret.toString(), null);
}
} catch (IOException | ScriptException e) {