root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Code:Inconsistent synchronization 

AtomicBoolean and AtomicInt are not necessary when values are simply written and read and the previous value is irrelevant (e.g. AtomicInt would be needed if the value was incremented)
Bugzilla Id: 52266


git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1521665 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 1584795037
This commit is contained in:
Sebastian Bazley 2013-09-10 22:14:52 +00:00
parent 5309b881f1
commit 6c714aa1a2
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
View File

@ -36,8 +36,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.prefs.Preferences;
import org.apache.commons.io.IOUtils;
@ -226,19 +224,19 @@ public class ProxyControl extends GenericController {
private transient KeyStore keyStore;
private AtomicBoolean addAssertions = new AtomicBoolean(false);
private volatile boolean addAssertions = false;
private AtomicInteger groupingMode = new AtomicInteger(0);
private volatile int groupingMode = 0;
private AtomicBoolean samplerRedirectAutomatically = new AtomicBoolean(false);
private volatile boolean samplerRedirectAutomatically = false;
private AtomicBoolean samplerFollowRedirects = new AtomicBoolean(false);
private volatile boolean samplerFollowRedirects = false;
private AtomicBoolean useKeepAlive = new AtomicBoolean(false);
private volatile boolean useKeepAlive = false;
private AtomicBoolean samplerDownloadImages = new AtomicBoolean(false);
private volatile boolean samplerDownloadImages = false;
private AtomicBoolean regexMatch = new AtomicBoolean(false);// Should we match using regexes?
private volatile boolean regexMatch = false;// Should we match using regexes?
/**
* Tree node where the samples should be stored.
@ -279,12 +277,12 @@ public class ProxyControl extends GenericController {
}
public void setGroupingMode(int grouping) {
this.groupingMode.set(grouping);
this.groupingMode = grouping;
setProperty(new IntegerProperty(GROUPING_MODE, grouping));
}
public void setAssertions(boolean b) {
addAssertions.set(b);
addAssertions = b;
setProperty(new BooleanProperty(ADD_ASSERTIONS, b));
}
@ -297,12 +295,12 @@ public class ProxyControl extends GenericController {
setProperty(new StringProperty(SAMPLER_TYPE_NAME, samplerTypeName));
}
public void setSamplerRedirectAutomatically(boolean b) {
samplerRedirectAutomatically.set(b);
samplerRedirectAutomatically = b;
setProperty(new BooleanProperty(SAMPLER_REDIRECT_AUTOMATICALLY, b));
}
public void setSamplerFollowRedirects(boolean b) {
samplerFollowRedirects.set(b);
samplerFollowRedirects = b;
setProperty(new BooleanProperty(SAMPLER_FOLLOW_REDIRECTS, b));
}
@ -310,12 +308,12 @@ public class ProxyControl extends GenericController {
* @param b
*/
public void setUseKeepAlive(boolean b) {
useKeepAlive.set(b);
useKeepAlive = b;
setProperty(new BooleanProperty(USE_KEEPALIVE, b));
}
public void setSamplerDownloadImages(boolean b) {
samplerDownloadImages.set(b);
samplerDownloadImages = b;
setProperty(new BooleanProperty(SAMPLER_DOWNLOAD_IMAGES, b));
}
@ -331,7 +329,7 @@ public class ProxyControl extends GenericController {
* @param b
*/
public void setRegexMatch(boolean b) {
regexMatch.set(b);
regexMatch = b;
setProperty(new BooleanProperty(REGEX_MATCH, b));
}
@ -494,10 +492,10 @@ public class ProxyControl extends GenericController {
removeValuesFromSampler(sampler, defaultConfigurations);
replaceValues(sampler, subConfigs, userDefinedVariables);
sampler.setAutoRedirects(samplerRedirectAutomatically.get());
sampler.setFollowRedirects(samplerFollowRedirects.get());
sampler.setUseKeepAlive(useKeepAlive.get());
sampler.setImageParser(samplerDownloadImages.get());
sampler.setAutoRedirects(samplerRedirectAutomatically);
sampler.setFollowRedirects(samplerFollowRedirects);
sampler.setUseKeepAlive(useKeepAlive);
sampler.setImageParser(samplerDownloadImages);
placeSampler(sampler, subConfigs, myTarget);
} else {
@ -895,7 +893,7 @@ public class ProxyControl extends GenericController {
boolean firstInBatch = false;
long now = System.currentTimeMillis();
long deltaT = now - lastTime;
int cachedGroupingMode = groupingMode.get();
int cachedGroupingMode = groupingMode;
if (deltaT > sampleGap) {
if (!myTarget.isLeaf() && cachedGroupingMode == GROUPING_ADD_SEPARATORS) {
addDivider(treeModel, myTarget);
@ -945,7 +943,7 @@ public class ProxyControl extends GenericController {
try {
final JMeterTreeNode newNode = treeModel.addComponent(sampler, myTargetFinal);
if (firstInBatchFinal) {
if (addAssertions.get()) {
if (addAssertions) {
addAssertion(treeModel, newNode);
}
addTimers(treeModel, newNode, deltaTFinal);
@ -1064,7 +1062,7 @@ public class ProxyControl extends GenericController {
}
try {
boolean cachedRegexpMatch = regexMatch.get();
boolean cachedRegexpMatch = regexMatch;
replacer.reverseReplace(sampler, cachedRegexpMatch);
for (int i = 0; i < configs.length; i++) {
if (configs[i] != null) {