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 2009/05/10 20:14:20 UTC
svn commit: r773376 - in /jakarta/jmeter/trunk/src:
components/org/apache/jmeter/assertions/ core/org/apache/jmeter/util/
monitor/components/org/apache/jmeter/monitor/util/
protocol/http/org/apache/jmeter/protocol/http/control/
protocol/http/org/apache...
Author: sebb
Date: Sun May 10 18:14:20 2009
New Revision: 773376
URL: http://svn.apache.org/viewvc?rev=773376&view=rev
Log:
Tab police
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Sun May 10 18:14:20 2009
@@ -331,7 +331,7 @@
String stringPattern = iter.next().getStringValue();
Pattern pattern = null;
if (contains || matches) {
- pattern = JMeterUtils.getPatternCache().getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
+ pattern = JMeterUtils.getPatternCache().getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
}
boolean found;
if (contains) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java Sun May 10 18:14:20 2009
@@ -216,7 +216,7 @@
global.put("bsf", global, bsf);
for(Iterator it = declaredBeans.iterator(); it.hasNext();) {
- declareBean((BSFDeclaredBean) it.next());
+ declareBean((BSFDeclaredBean) it.next());
}
}
catch (Throwable t) {
Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java (original)
+++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java Sun May 10 18:14:20 2009
@@ -82,7 +82,7 @@
// of the list. Peter 12.22.04
double threadWeight = 0;
if (stat.getConnector().size() > 0) {
- Connector cntr = fetchConnector(stat);
+ Connector cntr = fetchConnector(stat);
int maxThread = cntr.getThreadInfo().getMaxThreads();
int curThread = cntr.getThreadInfo().getCurrentThreadsBusy();
double thdiv = (double) curThread / (double) maxThread;
@@ -109,7 +109,7 @@
*/
public static int calculateStatus(Status stat) {
if (stat != null && stat.getConnector().size() > 0) {
- Connector cntr = fetchConnector(stat);
+ Connector cntr = fetchConnector(stat);
int max = cntr.getThreadInfo().getMaxThreads();
int current = cntr.getThreadInfo().getCurrentThreadsBusy();
// int spare = cntr.getThreadInfo().getMaxSpareThreads();
@@ -172,9 +172,9 @@
* @return connector
*/
private static Connector fetchConnector(Status stat) {
- Connector cntr = null;
- String connectorPrefix = stat.getConnectorPrefix();
- if (connectorPrefix != null && connectorPrefix.length() > 0) {
+ Connector cntr = null;
+ String connectorPrefix = stat.getConnectorPrefix();
+ if (connectorPrefix != null && connectorPrefix.length() > 0) {
// loop to fetch desired connector
for (int i = 0; i < stat.getConnector().size(); i++) {
cntr = (Connector) stat.getConnector().get(i);
@@ -182,10 +182,10 @@
return cntr;
}
}
- }
+ }
// default : get first connector
cntr = (Connector) stat.getConnector().get(0);
- return cntr;
+ return cntr;
}
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Sun May 10 18:14:20 2009
@@ -262,54 +262,54 @@
this.SOAPHeader = header;
}
- /**
- * Merge the attributes with a another HeaderManager's attributes.
- * @param element The object to be merged with
- * @param preferLocalValues When both objects have a value for the
- * same attribute, this flag determines which value is preferresd.
- */
- public HeaderManager merge(TestElement element, boolean preferLocalValues) {
- if (!(element instanceof HeaderManager)) {
- throw new IllegalArgumentException("Cannot merge type:" + this.getClass().getName() + " with type:" + element.getClass().getName());
- }
-
- // start off with a merged object as a copy of the local object
- HeaderManager merged = (HeaderManager)this.clone();
-
- HeaderManager other = (HeaderManager)element;
- // iterate thru each of the other headers
- for (int i = 0; i < other.getHeaders().size(); i++) {
- Header otherHeader = other.get(i);
- boolean found = false;
- // find the same property in the local headers
- for (int j = 0; j < merged.getHeaders().size(); j++) {
- Header mergedHeader = merged.get(j);
- if (mergedHeader.getName().equalsIgnoreCase(otherHeader.getName())) {
- // we have a match
- found = true;
- if (!preferLocalValues) {
- // prefer values from the other object
- if ( (otherHeader.getValue() == null) || (otherHeader.getValue().length() == 0) ) {
- // the other object has an empty value, so remove this value from the merged object
- merged.remove(j);
- } else {
- // use the other object's value
- mergedHeader.setValue(otherHeader.getValue());
- }
- }
- // break out of the inner loop
- break;
- }
- }
- if (!found) {
- // the other object has a new value to be added to the merged
- merged.add(otherHeader);
- }
- }
-
- // finally, merge the names so it's clear they've been merged
- merged.setName(merged.getName() + ":" + other.getName());
-
- return merged;
- }
+ /**
+ * Merge the attributes with a another HeaderManager's attributes.
+ * @param element The object to be merged with
+ * @param preferLocalValues When both objects have a value for the
+ * same attribute, this flag determines which value is preferresd.
+ */
+ public HeaderManager merge(TestElement element, boolean preferLocalValues) {
+ if (!(element instanceof HeaderManager)) {
+ throw new IllegalArgumentException("Cannot merge type:" + this.getClass().getName() + " with type:" + element.getClass().getName());
+ }
+
+ // start off with a merged object as a copy of the local object
+ HeaderManager merged = (HeaderManager)this.clone();
+
+ HeaderManager other = (HeaderManager)element;
+ // iterate thru each of the other headers
+ for (int i = 0; i < other.getHeaders().size(); i++) {
+ Header otherHeader = other.get(i);
+ boolean found = false;
+ // find the same property in the local headers
+ for (int j = 0; j < merged.getHeaders().size(); j++) {
+ Header mergedHeader = merged.get(j);
+ if (mergedHeader.getName().equalsIgnoreCase(otherHeader.getName())) {
+ // we have a match
+ found = true;
+ if (!preferLocalValues) {
+ // prefer values from the other object
+ if ( (otherHeader.getValue() == null) || (otherHeader.getValue().length() == 0) ) {
+ // the other object has an empty value, so remove this value from the merged object
+ merged.remove(j);
+ } else {
+ // use the other object's value
+ mergedHeader.setValue(otherHeader.getValue());
+ }
+ }
+ // break out of the inner loop
+ break;
+ }
+ }
+ if (!found) {
+ // the other object has a new value to be added to the merged
+ merged.add(otherHeader);
+ }
+ }
+
+ // finally, merge the names so it's clear they've been merged
+ merged.setName(merged.getName() + ":" + other.getName());
+
+ return merged;
+ }
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sun May 10 18:14:20 2009
@@ -222,8 +222,8 @@
} catch (IllegalArgumentException e) {
log.error("Not implemented (probably used https)", e);
writeErrorToClient(HttpReplyHdr.formNotImplemented("Probably used https instead of http. " +
- "To record https requests, see " +
- "<a href=\"http://jakarta.apache.org/jmeter/usermanual/component_reference.html#HTTP_Proxy_Server\">HTTP Proxy Server documentation</a>"));
+ "To record https requests, see " +
+ "<a href=\"http://jakarta.apache.org/jmeter/usermanual/component_reference.html#HTTP_Proxy_Server\">HTTP Proxy Server documentation</a>"));
result = generateErrorResult(result, e); // Generate result (if nec.) and populate it
} catch (Exception e) {
log.error("Exception when processing sample", e);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Sun May 10 18:14:20 2009
@@ -739,10 +739,10 @@
log.warn("Existing HeaderManager '" + mgr.getName() + "' merged with '" + value.getName() + "'");
value = mgr.merge(value, true);
if (log.isDebugEnabled()) {
- log.debug("HeaderManager merged: " + value.getName());
- for (int i=0; i < value.getHeaders().size(); i++) {
- log.debug(" " + value.getHeader(i).getName() + "=" + value.getHeader(i).getValue());
- }
+ log.debug("HeaderManager merged: " + value.getName());
+ for (int i=0; i < value.getHeaders().size(); i++) {
+ log.debug(" " + value.getHeader(i).getName() + "=" + value.getHeader(i).getValue());
+ }
}
}
setProperty(new TestElementProperty(HEADER_MANAGER, value));
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java Sun May 10 18:14:20 2009
@@ -89,7 +89,7 @@
producer.send(request);
if(useReqMsgIdAsCorrelId) {
- id = request.getJMSMessageID();
+ id = request.getJMSMessageID();
}
MessageAdmin.getAdmin().putRequest(id, request);
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=773376&r1=773375&r2=773376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Sun May 10 18:14:20 2009
@@ -191,9 +191,9 @@
// WebsphereMQ does not allow corr. id. to be set using setStringProperty()
if("JMSCorrelationID".equalsIgnoreCase(name)) { // $NON-NLS-1$
- msg.setJMSCorrelationID(value);
+ msg.setJMSCorrelationID(value);
} else {
- msg.setStringProperty(name, value);
+ msg.setStringProperty(name, value);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org